两员配备- 绑定账号接口修改（添加用户组）

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -76,7 +76,7 @@
             tec.NAME equipType,
             "SUPERVISORY_CODE" supervisorCode,
             "CODE96333" code96333 ,
-            case when (SELECT count(1) FROM tzs_user_equip t1 LEFT JOIN tzs_user_info t2 on t1.user_seq = t2.sequence_nbr where equip_id = ibjui."SEQUENCE_NBR") >0 THEN 1 ELSE 0 end  isNotBind,
+            case when (SELECT count(1) FROM tzs_user_equip t1 LEFT JOIN tzs_user_info t2 on t1.user_seq = t2.sequence_nbr where equip_id = ibjui."SEQUENCE_NBR") >0 THEN '是' ELSE '否' end  isNotBind,
             (SELECT GROUP_CONCAT(t2.name) from tzs_user_equip t1 LEFT JOIN tzs_user_info t2 on t1.user_seq = t2.sequence_nbr  where equip_id = ibjui."SEQUENCE_NBR") "safety"
         FROM
             "idx_biz_jg_use_info" ibjui

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/TzsUserEquipServiceImpl.java

@@ -4,7 +4,8 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserEquipDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserEquip;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserEquipService;
+import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
+@Service
 public class TzsUserEquipServiceImpl extends BaseService<TzsUserEquipDto, TzsUserEquip, TzsUserEquipMapper> implements ITzsUserEquipService {
 }

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

 package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 
+import cn.hutool.json.ObjectMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -68,6 +69,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     private final String USER_ROLE = "QYRYJS";
     //企业人员用户组
     private final String ROLE_GROUP = "QYRYYHZ";
+    //两个规定用户组-对应企业人员的人员类型
+    private final String QYRYGW = "QYRYGW";
     //平台用户锁定状态
     private final String UNLOCK = "UNLOCK";
     private final String LOCK = "LOCK";
@@ -240,6 +243,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             userResult = Privilege.agencyUserClient.create(agencyUserModel);
             if (userResult.getStatus() == 200) {
+                TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
+                tzsUserInfo.setAmosUserId(userResult.getResult().getUserId());
+                tzsUserInfo.setAmosUserName(userResult.getResult().getUserName());
+                tzsUserInfo.setLockStatus(status);
+                //绑定企业整改用户组
                 List<String> userIds = new ArrayList<>();
                 userIds.add(userResult.getResult().getUserId());
                 DataDictionary roleGroup = iDataDictionaryService
@@ -247,10 +255,16 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                 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());
-                tzsUserInfo.setLockStatus(status);
+                //绑定两个规定用户组
+                String post = tzsUserInfo.getPost();
+                post = post.replace("[","").replace("]","").replace("\"","");
+                for (String code : post.split(",")) {
+                    DataDictionary groupId = iDataDictionaryService
+                            .getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, code).likeRight(DataDictionary::getType, QYRYGW));
+                    if (!ObjectUtils.isEmpty(groupId) && groupId.getExtend() != null) {
+                        Privilege.groupUserClient.create(Long.valueOf(groupId.getExtend()), userIds);
+                    }
+                }
                 tzsUserInfoMapper.updateById(tzsUserInfo);
             }
             return true;
@@ -371,7 +385,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                 tzsUserEquipList.add(tzsUserEquip);
             }
             flag = tzsUserEquipService.saveBatch(tzsUserEquipList);
-        } else {
+        } else if("untie".equals(type)) {
             int num = tzsUserEquipMapper.delete(new QueryWrapper<TzsUserEquip>().eq("user_seq", userSeq).in("equip_id", ids));
             flag = num > 0 ? true : flag;
         }