feature: tjdsj权限中心bug修改

1. tjdsj权限中心bug修改

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleAuthInfoController.java

@@ -18,10 +18,12 @@ import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffAssignAuthInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffOperateVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffRoleOperateVo;
 import com.dragoninfo.dcuc.duceap.facade.ICodeListResourceFacade;
+import com.dragoninfo.dcuc.duceap.facade.IDuceapCodeFacade;
 import com.dragoninfo.dcuc.org.entity.OrgInfo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
 import com.dragoninfo.dcuc.user.user.entity.UserInfo;
 import com.dragoninfo.dcuc.user.user.entity.UserInfoView;
+import com.dragoninfo.dcuc.user.user.enumresources.JobTypeEnum;
 import com.dragoninfo.dcuc.user.user.enumresources.YesNotEnum;
 import com.dragoninfo.dcuc.user.user.facade.IUserInfoFacade;
 import com.dragoninfo.duceap.core.enums.RoleLevelEnum;
@@ -41,6 +43,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -67,6 +70,8 @@ public class RoleAuthInfoController {
     private MtAuthBusiness mtAuthBusiness;
     @Autowired
     private ICodeListResourceFacade iCodeListResourceFacade;
+    @Autowired
+    private IDuceapCodeFacade iDuceapCodeFacade;
 
     /**
      * 角色视图 人员列表
@@ -99,6 +104,11 @@ public class RoleAuthInfoController {
         searchable.addSearchFilter("deleted", SearchOperator.eq,YesNotEnum.NO.getValue());
         searchable.addSearchFilter("name", SearchOperator.ne,iUserInfoFacade.getRootUser());
         searchable.addSearchFilter("org_id", SearchOperator.eq,vo.getOrgId());
+        List<String> jobType = new ArrayList<String>();
+        jobType.add(JobTypeEnum.LZ.getValue());
+        jobType.add(JobTypeEnum.SW.getValue());
+        jobType.add(JobTypeEnum.TX.getValue());
+        searchable.addSearchFilter("jobType", SearchOperator.notIn, jobType);
         if(StringUtils.isNotEmpty(vo.getName())){
             searchable.addSearchFilter("name", SearchOperator.like,vo.getName());
         }
@@ -269,6 +279,9 @@ public class RoleAuthInfoController {
         vo.setOrgId(orgId);
         vo.setSearchDTO(searchable.toSearchDTO());
         page = roleInfoFacade.getOrgRoleQuota(vo);
+        for (RoleInfoVO roleInfoVO : page.getContent()) {
+            roleInfoVO.setRoleBusiness(getLavleValue(roleInfoVO.getRoleBusiness()));
+        }
         return Result.success(page.getTotalElements(),page.getContent());
     }
 
@@ -307,8 +320,9 @@ public class RoleAuthInfoController {
         for (StaffAssignAuthInfo assignAuthInfo : staffAssignAuthInfoList) {
             roleMap.put(assignAuthInfo.getRoleId(), assignAuthInfo.getActiveTime());
         }
-        Map<String, ArrayList<CodeRecord>> listCodes = iCodeListResourceFacade.listCodes("code", "DM_POLICE_BUSINESS,DM_ROLE_LEVEL,T_MD_POLICE_TYPE");
+        Map<String, ArrayList<CodeRecord>> listCodes = iCodeListResourceFacade.listCodes("code", "DM_ROLE_LEVEL,T_MD_POLICE_TYPE");
         HashMap<String, Map<String, String>> map = getConvertMap(listCodes);
+
         for (RoleInfoVO roleInfoVO : roleInfoVOList) {
             if (roleMap.containsKey(roleInfoVO.getId())) {
                 roleInfoVO.setCause(1);
@@ -316,7 +330,8 @@ public class RoleAuthInfoController {
             } else {
                 roleInfoVO.setActiveTime("长期");
             }
-            String policeBusinessLable = map.get("DM_POLICE_BUSINESS").get(roleInfoVO.getRoleBusiness());
+            String policeBusinessLable = getLavleValue(roleInfoVO.getRoleBusiness());
+
             roleInfoVO.setRoleBusiness(policeBusinessLable);
             String roleLevelLable = map.get("DM_ROLE_LEVEL").get(roleInfoVO.getRoleLevel());
             roleInfoVO.setRoleLevel(roleLevelLable);
@@ -326,6 +341,29 @@ public class RoleAuthInfoController {
         return Result.success(roleInfoVOList);
     }
 
+    private String getLavleValue(String value) {
+        HashMap<String, String> codeMap = getCodeVLMap("T_USER_LABEL");
+        String codeValue = "";
+        if(StringUtils.isNotEmpty(value)){
+            String[] codeLable = value.split(",");
+            for (String s : codeLable) {
+                codeValue += codeMap.get(s)+",";
+            }
+        }
+        return codeValue;
+    }
+
+    private HashMap<String, String> getCodeVLMap(String name) {
+        HashMap<String, String> map = new HashMap<String, String>();
+        List<Map<String, Object>> codeResource = iDuceapCodeFacade.getCodeResource(name);
+        codeResource.forEach(item->{
+            String lable = item.get("NAME").toString();
+            String value = item.get("CODE").toString();
+            map.put(value,lable);
+        });
+        return map;
+    }
+
 
     /**
      * 角色视图保存

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/org/OrgInfoController.java

@@ -336,7 +336,7 @@ public class OrgInfoController {
         ResponseStatus result = iOrgInfoFacade.orgInfoMerge(orgId, targetId);
         if (result.getStatusCode().equals("200")) {
             OrgInfo orgInfo = iOrgInfoFacade.detail(targetId);
-            iUserInfoFacade.updateByOrgId(orgId, targetId, orgInfo.getFullName());
+            iUserInfoFacade.updateByOrgId(orgId, targetId, orgInfo.getFullName(),orgInfo.getCode());
             List<NoticeUserVO> list = iManageInfoFacade.getManagerByOrgId(orgId);
             for (NoticeUserVO note : list) {
                 if (!StringUtils.isEmpty(note.getUserId())) {