企业人员绑定添加绑定用户组

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -47,6 +47,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
     @Autowired
     private DataDictionaryMapper dataDictionaryMapper;
+    //企业人员角色
+    private final String USER_ROLE = "QYRYJS";
+    //企业人员用户组
+    private final String ROLE_GROUP = "QYRYYHZ";
 
     @Autowired
     private TzsUserQualificationsServiceImpl tzsUserQualificationsService;
@@ -174,6 +178,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         String sequenceNbr = map.get("sequenceNbr").toString();
         String roles = map.get("role").toString();
         String status = map.get("status").toString();
+        String roleGroupCode = map.get("roleGroup").toString();
 
         FeignClientResult<AgencyUserModel> userResult = null;
         try {
@@ -195,7 +200,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             List<RoleModel> allRoleList = new ArrayList<>();
             List<Long> roleIds = new ArrayList<>();
             DataDictionary unitType = iDataDictionaryService
-                    .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, roles));
+                    .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, roles).eq(DataDictionary::getType, USER_ROLE));
             String role = unitType.getExtend() != null ? unitType.getExtend() : "";
             for (String s : role.split(",")) {
                 RoleModel roleModel = Privilege.roleClient.seleteOne(Long.valueOf(s)).getResult();
@@ -216,6 +221,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             userResult = Privilege.agencyUserClient.create(agencyUserModel);
             if (userResult.getStatus() == 200) {
+                List<String> userIds = new ArrayList<>();
+                userIds.add(userResult.getResult().getUserId());
+                DataDictionary roleGroup = iDataDictionaryService
+                        .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, roleGroupCode).eq(DataDictionary::getType, ROLE_GROUP));
+                if (!ObjectUtils.isEmpty(roleGroup) && roleGroup.getExtend() != null) {
+                    Privilege.groupUserClient.create(Long.valueOf(roleGroup.getExtend()), userIds);
+                }
                 TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
                 tzsUserInfo.setAmosUserId(userResult.getResult().getUserId());
                 tzsUserInfo.setAmosUserName(userResult.getResult().getUserName());