Merge remote-tracking branch 'origin/master'

supervision-admin/src/main/java/com/supervision/web/controller/combatduty/BdglGrassdutyController.java

@@ -71,10 +71,10 @@ public class BdglGrassdutyController extends BaseController {
         boolean falg=false;
         boolean falg1=false;
         for (String string : strings) {
-            if("user_admin".equals(string)){
+            if("admin".equals(string)){
                 falg1=true;
                 break;
-            } else if (!"user_admin".equals(string)) {
+            } else if (!"admin".equals(string)) {
                 if(sysDept!=null&&sysDept.getAncestors()!=null){
                     falg = isFalg(sysDept, loginUser, falg);
                 }

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglArmamentController.java

@@ -50,7 +50,7 @@ public class BdglArmamentController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglArmament.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglDiaryController.java

@@ -78,7 +78,7 @@ public class BdglDiaryController extends BaseController {
         String role = "";
         if (sysRoles != null) {
             for (SysRole sysRole : sysRoles) {
-                if (sysRole.getRoleKey().equals("user_admin")||sysRole.getRoleKey().equals("special_registration")) {
+                if (sysRole.getRoleKey().equals("admin")||sysRole.getRoleKey().equals("special_registration")) {
                     role = sysRole.getRoleKey();
                     break;
                 }
@@ -91,7 +91,7 @@ public class BdglDiaryController extends BaseController {
         if (bdglDiary.getDiaryTime() == null && bdglDiary.getUnitId() == null) {
             bdglDiary.setDiaryTime(format);
         }
-        if (!role.equals("user_admin")&&!role.equals("special_registration")) {
+        if (!role.equals("admin")&&!role.equals("special_registration")) {
             bdglDiary.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglEquipController.java

@@ -61,7 +61,7 @@ public class BdglEquipController extends BaseController {
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if (!role.equals("user_admin")) {
+        if (!role.equals("admin")) {
             bdglEquip.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglEvenController.java

@@ -69,14 +69,14 @@ public class BdglEvenController extends BaseController
         String role="";
         if(sysRoles!=null){
             for (SysRole sysRole : sysRoles) {
-                if(sysRole.getRoleKey().equals("user_admin")){
+                if(sysRole.getRoleKey().equals("admin")){
                     role=sysRole.getRoleKey();
                     break;
                 }
             }
         }
-        boolean user_admin = role.equals("user_admin");
-        if(sysUser.getUserName().equals("admin")||role.equals("user_admin")){
+        boolean admin = role.equals("admin");
+        if(sysUser.getUserName().equals("admin")||role.equals("admin")){
 
         }else{
             bdglEven.setUnitId(Integer.parseInt(loginUser.getDeptId().toString())  );

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglFileManagementController.java

@@ -53,7 +53,7 @@ public class BdglFileManagementController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglFileManagement.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglFoodController.java

@@ -51,7 +51,7 @@ public class BdglFoodController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglFood.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglMeetingController.java

@@ -58,7 +58,7 @@ public class BdglMeetingController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglMeeting.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglPartyController.java

@@ -60,7 +60,7 @@ public class BdglPartyController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglParty.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglPublicPropertyController.java

@@ -51,7 +51,7 @@ public class BdglPublicPropertyController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglPublicProperty.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglSecrecyController.java

@@ -50,7 +50,7 @@ public class BdglSecrecyController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglSecrecy.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/BdglSoldierController.java

@@ -59,7 +59,7 @@ public class BdglSoldierController extends BaseController
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglSoldier.setUnitId(Integer.parseInt(loginUser.getDeptId().toString()));
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/CommonsController.java

@@ -72,14 +72,14 @@ public class CommonsController extends BaseController {
         String role="";
         if(sysRoles!=null){
             for (SysRole sysRole : sysRoles) {
-                if(sysRole.getRoleKey().equals("user_admin")||sysRole.getRoleKey().equals("baomi")||sysRole.getRoleKey().equals("CLSPR")){
+                if(sysRole.getRoleKey().equals("admin")||sysRole.getRoleKey().equals("baomi")||sysRole.getRoleKey().equals("CLSPR")){
                     role=sysRole.getRoleKey();
                     break;
                 }
             }
         }
         List<SysDept> sysDepts1=new ArrayList<>();
-        if(sysUser.getUserName().equals("admin")||type!=null||role.equals("user_admin")||role.equals("baomi")||role.equals("CLSPR")){
+        if(sysUser.getUserName().equals("admin")||type!=null||role.equals("admin")||role.equals("baomi")||role.equals("CLSPR")){
             SysDept sysDept = new SysDept();
             List<SysDept> sysDepts = sysDeptService.selectDeptLists(sysDept);
 //            for (SysDept dept : sysDepts) {

supervision-admin/src/main/java/com/supervision/web/controller/grassrootsregistration/PersonnelRosterController.java

@@ -49,7 +49,7 @@ public class PersonnelRosterController extends BaseController {
         List<SysRole> sysRoles = userMapper.selectRole(loginUser.getUserId());
         String role = CommonsController.getRole(sysRoles);
         //判断当前角色是否是最高权限   不是返回当前部门数据
-        if(!role.equals("user_admin")){
+        if(!role.equals("admin")){
             bdglPeople.setDeptId(loginUser.getDeptId());
         }
         startPage();

supervision-admin/src/main/java/com/supervision/web/controller/peopleChuRu/BdglLeaveOneController.java

@@ -60,7 +60,7 @@ public class BdglLeaveOneController extends BaseController
         List<String> roleKeylist = iSysUserService.selectUserRoleKey(getUserId());
         boolean userAdmin = true;
         for (String role : roleKeylist) {
-            if ("user_admin".equals(role)) {
+            if ("admin".equals(role)) {
                 userAdmin = false;
                 break;
             }

supervision-admin/src/main/java/com/supervision/web/controller/workingArrangements/BdglPlanTaskController.java

@@ -124,13 +124,13 @@ public class BdglPlanTaskController extends BaseController {
         String role="";
         if(sysRoles!=null){
             for (SysRole sysRole : sysRoles) {
-                if(sysRole.getRoleKey().equals("user_admin")){
+                if(sysRole.getRoleKey().equals("admin")){
                     role=sysRole.getRoleKey();
                     break;
                 }
             }
         }
-        if(role.equals("user_admin")){
+        if(role.equals("admin")){
             BdglPlanProgress bdglPlanProgress1 = new BdglPlanProgress();
             bdglPlanProgress1.setTaskId(planTask.getId());
             bdglPlanProgresses = planProgressService.selectBdglPlanProgressList(bdglPlanProgress1);

supervision-admin/src/main/java/com/supervision/web/controller/workingArrangements/BdglWorkTaskController.java

@@ -97,7 +97,7 @@ public class BdglWorkTaskController extends BaseController {
         List<SysRole> sysRoles=userMapper.selectRole(loginUser.getUserId());
         if(sysRoles!=null){
             for (SysRole sysRole : sysRoles) {
-                if(sysRole.getRoleKey().equals("user_admin")){
+                if(sysRole.getRoleKey().equals("admin")){
                     BdglWorkProgress bdglPlanProgress1 = new BdglWorkProgress();
                     bdglPlanProgress1.setTaskId(workTask.getId());
                     workProgresses = bdglWorkProgressService.selectBdglWorkProgressList(bdglPlanProgress1);

supervision-system/src/main/java/com/supervision/peopleManage/service/impl/BdglPeopleServiceImpl.java

@@ -56,6 +56,8 @@ public class BdglPeopleServiceImpl implements IBdglPeopleService
         BdglPeople bdglPeople = bdglPeopleMapper.selectBdglPeopleById(id);
         if(familyInformations!=null&&familyInformations.size()>0&&bdglPeople!=null) {
         	bdglPeople.setFamilyInformation(familyInformations);
+        }else{
+            bdglPeople.setFamilyInformation(new ArrayList<>());
         }
         
         return bdglPeople;

supervision-system/src/main/resources/mapper/grassrootsregistration/BdglStatisticsMapper.xml

@@ -68,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitName != null">unit_name = #{unitName},</if>
             <if test="title != null">title = #{title},</if>
             <if test="fileName != null">file_name = #{fileName},</if>
+            <if test="fileName == null">file_name = NULL,</if>
             <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="filePath == null">file_path = NULL,</if>
             <if test="time != null">time = #{time},</if>
         </trim>
         where id = #{id}