新增监理单位角色

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java

@@ -20,7 +20,8 @@ public enum OrgEnum {
     安装单位("INSTALL","250","安装单位",1,"studio_normalapp_4403119,studio_normalapp_4760213"),
     设计单位("DESIGN","251","设计单位",1,"studio_normalapp_4403119,studio_normalapp_4760213"),
     监察部门("SUPERVISION","252","监察部门",1,"studio_normalapp_4403119,studio_normalapp_4761616"),
-    监检机构("MONITORING","253","监检机构",1,"studio_normalapp_4403119,studio_normalapp_4761616");
+    监检机构("MONITORING","253","监检机构",1,"studio_normalapp_4403119,studio_normalapp_4761616"),
+    监理单位("SUPERVISOR","254","监理单位",1,"");
 
     private String key;
     private String code;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -197,10 +197,12 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             String[] unitTypeCodes = company.getType().split(",");
             for(String code : unitTypeCodes) {
                 roleNameSet.add(OrgEnum.map.get(code));
-                String[] codes = OrgEnum.codeMap.get(code).split(",");
-                for(int i = 0;i <codes.length; i++){
-                    if(!appCodeSet.contains(codes[i])){
-                        appCodeSet.add(codes[i]);
+                if(!ValidationUtil.isEmpty(OrgEnum.codeMap.get(code))){
+                    String[] codes = OrgEnum.codeMap.get(code).split(",");
+                    for(int i = 0;i <codes.length; i++){
+                        if(!appCodeSet.contains(codes[i])){
+                            appCodeSet.add(codes[i]);
+                        }
                     }
                 }
             }