新增管理员空角色

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -63,6 +63,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
     protected EmqKeeper emqKeeper;
     @Value("${hygf.user.group.id}")
     private long userGroupId;
+
+    @Value("${hygf.user.group.empty}")
+    private long userGroupempty;
     /**
      * 分页查询
      */
@@ -355,51 +358,57 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         unitInfo.setAdminUserName(publicAgencyUse.getRealName());
         unitInfoMapper.updateById(unitInfo);
         //修改管理员
-        List<Long>  roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
-            if(roidx==null){
-                publicAgencyUsex.setRole(null);
-            }else{
-                roidx.remove(userGroupId);
-                publicAgencyUsex.setRole(JSON.toJSONString(roidx));
-            }
+            List<Long>  roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
 
 
-        //修改当前用户角色权限
-        List<Long>  roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
-        if(roid==null){
-            roid=new ArrayList<>();
-        }
-        roid.add(userGroupId);
-        publicAgencyUse.setRole(JSON.toJSONString(roid));
 
-        publicAgencyUserMapper.updateById(publicAgencyUsex);
-        publicAgencyUserMapper.updateById(publicAgencyUse);
 
-        //修改平台用户
-        List<String> userId = new ArrayList<>();
-        userId.add(publicAgencyUse.getAmosUserId());
+            //修改平台用户
+            List<String> userId = new ArrayList<>();
+            userId.add(publicAgencyUse.getAmosUserId());
+
+
+             System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
 
+             if(roidx!=null&&!roidx.isEmpty()&&roidx.size()==1&&roidx.get(0).longValue()==userGroupId){
+                 //新增空角色防止单位丢失
+                 Privilege.groupUserClient.create(userGroupempty, userId);
+             }
 
+            //删除旧管理员
+            Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
 
 
-        //删除旧管理员
-        Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
-            System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
 
             // 1 修改平台用户
             Privilege.groupUserClient.create(userGroupId, userId);
-            System.out.println("新增角色用户===================================:"+userId);
 
 
-//            userEmpowerMapper.upuserrole(
-//                    publicAgencyUse.getSequenceNbr(),
-//                    publicAgencyUse.getAmosUserId(),
-//                    userGroupId,
-//                    personnelBusines.getAmosUnitId()
-//            );
+            System.out.println("新增角色用户===================================:"+userId);
 
 
             //修改权限
+            if(roidx==null){
+                publicAgencyUsex.setRole(null);
+            }else{
+                roidx.remove(userGroupId);
+                publicAgencyUsex.setRole(JSON.toJSONString(roidx));
+            }
+            //修改当前用户角色权限
+            List<Long>  roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
+            if(roid==null){
+                roid=new ArrayList<>();
+            }
+            roid.add(userGroupId);
+            publicAgencyUse.setRole(JSON.toJSONString(roid));
+
+            publicAgencyUserMapper.updateById(publicAgencyUsex);
+            publicAgencyUserMapper.updateById(publicAgencyUse);
+
+
+
+
+
         //旧管理员去除
         List<String> li=null;
         LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -168,6 +168,9 @@ hygf.user.group.id=1702512164058718210
 regionalCompanies.company.seq=1701778292098498561
 
 
+hygf.user.group.empty=1775056568031645697
+
+
 
 #qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
 #qiyuesuo.accessKey = a1lcd3WRRV