通过组id查询组及组内人员信息修改

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

@@ -436,43 +436,48 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         List<GroupAndPersonInfoDto> result = new ArrayList<>();
         List<AgencyUserModel> agencyUserModelList = Privilege.groupUserClient.queryForList(groupId).getResult();
         if (!ObjectUtils.isEmpty(agencyUserModelList) && agencyUserModelList.size() > 0) {
-
             for (AgencyUserModel agencyUserModel : agencyUserModelList) {
-                GroupAndPersonInfoDto groupAndPersonInfoDto = new GroupAndPersonInfoDto();
-                groupAndPersonInfoDto = tzsUserInfoMapper.getUnitInfoByUserId(agencyUserModel.getUserId());
-                groupAndPersonInfoDto.setGroupId(groupId);
-                String groupName = Privilege.groupClient.seleteOne(groupId).getResult().getGroupName();
-                groupAndPersonInfoDto.setGroupName(groupName);
-                groupAndPersonInfoDto.setUserId(agencyUserModel.getUserId());
-                groupAndPersonInfoDto.setUserName(agencyUserModel.getRealName());
-
-                String[] UnitType = groupAndPersonInfoDto.getUnitType().split(",");
-                if (UnitType.length > 0) {
-                    StringBuilder unitTypeCode = new StringBuilder();
-                    for (String s : UnitType) {
-                        unitTypeCode.append(UnitTypeEnum.getCode.get(s)).append(",");
+                GroupAndPersonInfoDto groupAndPersonInfoDto = tzsUserInfoMapper.getUnitInfoByUserId(agencyUserModel.getUserId());
+                if (ObjectUtils.isEmpty(groupAndPersonInfoDto)) {
+                    groupAndPersonInfoDto.setGroupId(groupId);
+                    String groupName = Privilege.groupClient.seleteOne(groupId).getResult().getGroupName();
+                    groupAndPersonInfoDto.setGroupName(groupName);
+                    groupAndPersonInfoDto.setUserId(agencyUserModel.getUserId());
+                    groupAndPersonInfoDto.setUserName(agencyUserModel.getRealName());
+                    String[] UnitType = groupAndPersonInfoDto.getUnitType().split(",");
+                    if (UnitType.length > 0) {
+                        StringBuilder unitTypeCode = new StringBuilder();
+                        for (String s : UnitType) {
+                            unitTypeCode.append(UnitTypeEnum.getCode.get(s)).append(",");
+                        }
+                        groupAndPersonInfoDto.setUnitTypeCode(unitTypeCode.substring(0, unitTypeCode.length() - 1));
+                    } else {
+                        groupAndPersonInfoDto.setUnitTypeCode(UnitTypeEnum.getCode.get(UnitType));
                     }
-                    groupAndPersonInfoDto.setUnitTypeCode(unitTypeCode.substring(0, unitTypeCode.length() - 1));
-                } else {
-                    groupAndPersonInfoDto.setUnitTypeCode(UnitTypeEnum.getCode.get(UnitType));
-                }
-                String EquipCategory =  groupAndPersonInfoDto.getEquipCategory()
-                        .replace("[","")
-                        .replace("]","")
-                        .replace("\"","");
-                List<String> equipCategoryList = Arrays.asList(EquipCategory.split(","));
-                if (equipCategoryList.size() > 0) {
-                    StringBuilder equipCategoryCode = new StringBuilder();
-                    StringBuilder equipCategory = new StringBuilder();
-                    for (String s : equipCategoryList) {
-                        equipCategoryCode.append(s).append(",");
-                        equipCategory.append(EquipmentClassifityEnum.getName.get(s)).append(",");
+
+                    if (!ObjectUtils.isEmpty(groupAndPersonInfoDto.getEquipCategory())) {
+                        String EquipCategory = groupAndPersonInfoDto.getEquipCategory()
+                                .replace("[", "")
+                                .replace("]", "")
+                                .replace("\"", "");
+                        List<String> equipCategoryList = Arrays.asList(EquipCategory.split(","));
+                        if (equipCategoryList.size() > 0) {
+                            StringBuilder equipCategoryCode = new StringBuilder();
+                            StringBuilder equipCategory = new StringBuilder();
+                            for (String s : equipCategoryList) {
+                                equipCategoryCode.append(s).append(",");
+                                equipCategory.append(EquipmentClassifityEnum.getName.get(s)).append(",");
+                            }
+                            groupAndPersonInfoDto.setEquipCategory(equipCategory.substring(0, equipCategory.length() - 1));
+                            groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryCode.substring(0, equipCategoryCode.length() - 1));
+                        } else {
+                            groupAndPersonInfoDto.setEquipCategory(EquipmentClassifityEnum.getName.get(equipCategoryList.get(0)));
+                            groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryList.get(0));
+                        }
+                    } else {
+                        groupAndPersonInfoDto.setEquipCategory(null);
+                        groupAndPersonInfoDto.setEquipCategoryCode(null);
                     }
-                    groupAndPersonInfoDto.setEquipCategory(equipCategory.substring(0, equipCategory.length() - 1));
-                    groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryCode.substring(0, equipCategoryCode.length() - 1));
-                } else {
-                    groupAndPersonInfoDto.setEquipCategory(EquipmentClassifityEnum.getName.get(equipCategoryList.get(0)));
-                    groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryList.get(0));
                 }
                 result.add(groupAndPersonInfoDto);
             }