修改企业审核（创建用户给用户加应用）接口

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

@@ -9,17 +9,17 @@ import java.util.HashMap;
 @Getter
 @AllArgsConstructor
 public enum OrgEnum {
-    公司("COMPANY", "244", "公司",1),
-    部门("DEPARTMENT", "245", "部门",2),
-    普通人员("PERSON", "246", "普通人员",3),
-    焊工("WELDER","247","焊工",3),
-    建设单位负责人("CHARGE","254","建设单位负责人",3),
-    企业管理员("ADMIN","248","企业管理员",3),
-    建设单位("CONSTRUCTION","249","建设单位",1),
-    安装单位("INSTALL","250","安装单位",1),
-    设计单位("DESIGN","251","设计单位",1),
-    监察部门("SUPERVISION","252","监察部门",1),
-    监检机构("MONITORING","253","监检机构",1);
+    公司("COMPANY", "244", "公司",1,"studio_normalapp_4403119"),
+    部门("DEPARTMENT", "245", "部门",2,"studio_normalapp_4403119"),
+    普通人员("PERSON", "246", "普通人员",3,"studio_normalapp_4403119"),
+    焊工("WELDER","247","焊工",3,"studio_normalapp_4403119"),
+    建设单位负责人("CHARGE","254","建设单位负责人",3,"studio_normalapp_4403119"),
+    企业管理员("ADMIN","248","企业管理员",3,"studio_normalapp_4403119"),
+    建设单位("CONSTRUCTION","249","建设单位",1,"studio_normalapp_4403119"),
+    安装单位("INSTALL","250","安装单位",1,"studio_normalapp_4403119"),
+    设计单位("DESIGN","251","设计单位",1,"studio_normalapp_4403119"),
+    监察部门("SUPERVISION","252","监察部门",1,"studio_normalapp_4403119"),
+    监检机构("MONITORING","253","监检机构",1,"studio_normalapp_4403119");
 
     private String key;
     private String code;
@@ -28,12 +28,14 @@ public enum OrgEnum {
      * 1 公司 2 部门 3 人员
      */
     private Integer type;
-
+    private String appCode;
     public static HashMap<String,String>  map= new HashMap();
+    public static HashMap<String, String> codeMap = new HashMap();
 
     static {
         for(OrgEnum orgPersonEnum:OrgEnum.values()){
             map.put(orgPersonEnum.getKey(),orgPersonEnum.getName());
+            codeMap.put(orgPersonEnum.getKey(),orgPersonEnum.getAppCode());
         }
     }
 }

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

@@ -117,6 +117,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         List<Long> roleIds = new ArrayList<>();
         Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
         Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
+        Set<String> appCodeSet = new HashSet<>();
+
 
         Company company = this.getById(sequenceNbr);
         company.setApproved(model.getApproved());
@@ -140,6 +142,9 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             String[] unitTypeCodes = company.getType().split(",");
             for(String code : unitTypeCodes) {
                 roleNameSet.add(OrgEnum.map.get(code));
+                if(!appCodeSet.contains(OrgEnum.codeMap.get(code))){
+                    appCodeSet.add(OrgEnum.codeMap.get(code));
+                }
             }
             Iterator iterator = roleNameSet.iterator();
 
@@ -169,6 +174,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             agencyUserModel.setUserName(adminLoginName);
             agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey));
             agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey));
+            List<String> appCodes = new ArrayList<>(appCodeSet);
+            agencyUserModel.setAppCodes(appCodes);
             agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
 
             //企业动态表单存储