通过组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,16 +436,14 @@ 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 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();
@@ -456,10 +454,12 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     } else {
                         groupAndPersonInfoDto.setUnitTypeCode(UnitTypeEnum.getCode.get(UnitType));
                     }
+
+                    if (!ObjectUtils.isEmpty(groupAndPersonInfoDto.getEquipCategory())) {
                         String EquipCategory = groupAndPersonInfoDto.getEquipCategory()
-                        .replace("[","")
-                        .replace("]","")
-                        .replace("\"","");
+                                .replace("[", "")
+                                .replace("]", "")
+                                .replace("\"", "");
                         List<String> equipCategoryList = Arrays.asList(EquipCategory.split(","));
                         if (equipCategoryList.size() > 0) {
                             StringBuilder equipCategoryCode = new StringBuilder();
@@ -474,6 +474,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                             groupAndPersonInfoDto.setEquipCategory(EquipmentClassifityEnum.getName.get(equipCategoryList.get(0)));
                             groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryList.get(0));
                         }
+                    } else {
+                        groupAndPersonInfoDto.setEquipCategory(null);
+                        groupAndPersonInfoDto.setEquipCategoryCode(null);
+                    }
+                }
                 result.add(groupAndPersonInfoDto);
             }
         }