修改焊工登录接口

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

@@ -104,17 +104,28 @@ public class WelderServiceImpl {
             agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
             //用户角色信息
             List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
-            if(1==jsonObject.getInteger("isWelder")){
-                roleNameSet.add(OrgEnum.焊工.getName());
-            } else {
             roleNameSet.add(OrgEnum.普通人员.getName());
+
+            //给登录人身份配置
+            userRoleList = allRoleList.stream().filter(r -> {
+                for(String roleName : roleNameSet){
+                    if(r.getRoleName().equals(roleName)){
+                        return true;
+                    }
                 }
-            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
+                return false;
+            }).collect(Collectors.toList());
             userRoleList.stream().forEach(r -> {
                 if (!roleIds.contains(r.getSequenceNbr())) {
                     roleIds.add(r.getSequenceNbr());
                 }
             });
+            //登录人应用权限
+            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);