两员配备-bug修改

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

@@ -172,6 +172,7 @@
             '344' certificateType,
             admin_id_number certificateNum,
             name unitName,
+            'UNLOCK' lockStatus,
             unit_code,
             admin_tel phone,
             admin_user_id amosUserId,

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

@@ -438,7 +438,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         if (!ObjectUtils.isEmpty(agencyUserModelList) && agencyUserModelList.size() > 0) {
             for (AgencyUserModel agencyUserModel : agencyUserModelList) {
                 GroupAndPersonInfoDto groupAndPersonInfoDto = tzsUserInfoMapper.getUnitInfoByUserId(agencyUserModel.getUserId());
-                if (ObjectUtils.isEmpty(groupAndPersonInfoDto)) {
+                if (!ObjectUtils.isEmpty(groupAndPersonInfoDto)) {
                     groupAndPersonInfoDto.setGroupId(groupId);
                     String groupName = Privilege.groupClient.seleteOne(groupId).getResult().getGroupName();
                     groupAndPersonInfoDto.setGroupName(groupName);
@@ -478,8 +478,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                         groupAndPersonInfoDto.setEquipCategory(null);
                         groupAndPersonInfoDto.setEquipCategoryCode(null);
                     }
+                    result.add(groupAndPersonInfoDto);
                 }
-                result.add(groupAndPersonInfoDto);
+
             }
         }
         return result;

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

@@ -840,6 +840,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				TzsUserInfo tzsUserInfo = new TzsUserInfo();
 				tzsUserInfo.setName(regUnitInfo.getAdminName());
 				tzsUserInfo.setCertificateType("344");
+				tzsUserInfo.setLockStatus("UNLOCK");
 				tzsUserInfo.setCertificateNum(regUnitInfo.getAdminIdNumber());
 				tzsUserInfo.setUnitName(regUnitInfo.getName());
 				tzsUserInfo.setUnitCode(regUnitInfo.getUnitCode());