修改ugp人员保存身份配置接口

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

@@ -15,11 +15,11 @@ public enum OrgEnum {
     焊工("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");
+    建设单位("CONSTRUCTION","249","建设单位",1,"studio_normalapp_4403119,studio_normalapp_4760213"),
+    安装单位("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");
 
     private String key;
     private String code;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/WelderMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+@Repository
 public interface WelderMapper extends BaseMapper {
     List<Map> welderStatistics(@Param("personCode") Set<String> personCode);
 }

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

@@ -118,27 +118,51 @@ public class WelderServiceImpl {
             agencyUserModel.setUserName(jsonObject.getString("phone"));
             agencyUserModel.setPassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
             agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
-            //用户角色信息
+            //用户角色信息和权限
             List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
+            List<String> appCodes = new ArrayList<>();
             if(orgexpand.equals(OrgEnum.安装单位.getKey())){
                 if(jsonObject.getString("isWelder").equals("1")){
                     roleNameSet.add(OrgEnum.普通人员.getName());
                 }else{
                     roleNameSet.add(OrgEnum.安装单位.getName());
+                    String[] codes = OrgEnum.安装单位.getAppCode().split(",");
+                    for(String code : codes){
+                        appCodes.add(code);
+                    }
+                    agencyUserModel.setAppCodes(appCodes);
+
                 }
             }else if(orgexpand.equals(OrgEnum.建设单位.getKey())){
                 roleNameSet.add(OrgEnum.建设单位.getName());
+                String[] codes = OrgEnum.建设单位.getAppCode().split(",");
+                for(String code : codes){
+                    appCodes.add(code);
+                }
+                agencyUserModel.setAppCodes(appCodes);
             }else if(orgexpand.equals(OrgEnum.监察部门.getKey())){
                 roleNameSet.add(OrgEnum.监察部门.getName());
+                String[] codes = OrgEnum.监察部门.getAppCode().split(",");
+                for(String code : codes){
+                    appCodes.add(code);
+                }
+                agencyUserModel.setAppCodes(appCodes);
             }else if(orgexpand.equals(OrgEnum.监检机构.getKey())){
                 roleNameSet.add(OrgEnum.监检机构.getName());
+                String[] codes = OrgEnum.监检机构.getAppCode().split(",");
+                for(String code : codes){
+                    appCodes.add(code);
+                }
+                agencyUserModel.setAppCodes(appCodes);
             }else if(orgexpand.equals(OrgEnum.设计单位.getKey())){
                 roleNameSet.add(OrgEnum.设计单位.getName());
+                String[] codes = OrgEnum.设计单位.getAppCode().split(",");
+                for(String code : codes){
+                    appCodes.add(code);
+                }
             }
 
 
-
-
             //给登录人身份配置
             userRoleList = allRoleList.stream().filter(r -> {
                 for(String roleName : roleNameSet){
@@ -154,11 +178,11 @@ public class WelderServiceImpl {
                 }
             });
             //登录人应用权限
-            List<String> appCodes = new ArrayList<>();
-            Map<String,String> map = new HashMap();
-            map.put("APPKey",OrgEnum.普通人员.getAppCode());
-            appCodes.add(map.get("APPKey"));
-            agencyUserModel.setAppCodes(appCodes);
+//            List<String> appCodes = new ArrayList<>();
+//            Map<String,String> map = new HashMap();
+//            map.put("APPKey",OrgEnum.普通人员.getAppCode());
+//            appCodes.add(map.get("APPKey"));
+//            agencyUserModel.setAppCodes(appCodes);
             roleSeqsMap.put(companyId,roleIds);
             orgRoles.put(companyId,userRoleList);
             agencyUserModel.setOrgRoleSeqs(roleSeqsMap);