修改saveWelder保存接口

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

@@ -86,7 +86,9 @@ public class WelderServiceImpl {
     @BusinessIdentify
     public OrgUsrDto savePerson(JSONObject jsonObject, String bizOrgType, String sequenceNbr){
         if(ValidationUtil.isEmpty(sequenceNbr)){
-            Long companyId = orgService.getReginParams().getCompany().getSequenceNbr();
+            Long  companyId= orgService.getReginParams().getCompany().getSequenceNbr();
+            Long companyUserId =  orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
+            String orgexpand = orgService.getOrgUsrById(String.valueOf(companyUserId)).getOrgExpandAttr1();
             Set<String> roleNameSet = new HashSet<>();
             List<RoleModel> userRoleList = new ArrayList<>();
             List<Long> roleIds = new ArrayList<>();
@@ -104,7 +106,24 @@ public class WelderServiceImpl {
             agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
             //用户角色信息
             List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
-            roleNameSet.add(OrgEnum.普通人员.getName());
+            if(orgexpand.equals(OrgEnum.安装单位.getKey())){
+                if(jsonObject.getString("isWelder").equals("1")){
+                    roleNameSet.add(OrgEnum.普通人员.getName());
+                }else{
+                    roleNameSet.add(OrgEnum.安装单位.getName());
+                }
+            }else if(orgexpand.equals(OrgEnum.建设单位.getKey())){
+                roleNameSet.add(OrgEnum.建设单位.getName());
+            }else if(orgexpand.equals(OrgEnum.监察部门.getKey())){
+                roleNameSet.add(OrgEnum.监察部门.getName());
+            }else if(orgexpand.equals(OrgEnum.监检机构.getKey())){
+                roleNameSet.add(OrgEnum.监检机构.getName());
+            }else if(orgexpand.equals(OrgEnum.设计单位.getKey())){
+                roleNameSet.add(OrgEnum.设计单位.getName());
+            }
+
+
+
 
             //给登录人身份配置
             userRoleList = allRoleList.stream().filter(r -> {