1.监管端人员列表人员资质状态历史数据处理

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

@@ -781,7 +781,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         List<String> post = this.getPostByType(type);
         Page<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionPage(permissionDtoPage, post, filter);
         result.getRecords().forEach(d -> {
-
             if (StringUtils.isNotEmpty(d.getIdentificationStr())) {
                 // 照片赋值
                 List<CommonFile> commonFiles = JSON.parseArray(d.getIdentificationStr(), CommonFile.class);
@@ -792,10 +791,19 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             // 人员类型枚举转name
             d.setPost(this.isJSONValid(d.getPost()) ? d.getPost() : "[\"" + d.getPost() + "\"]");
             d.setPostName(this.setPostName(d.getPost()));
+            d.setPermissionStatus(this.castNoPermissionData(type, d.getPermissionStatus()));
         });
         return result;
     }
 
+    private String castNoPermissionData(String type, String permissionStatus) {
+        // 历史数据处理：之前检验人员、检测人员、作业人员资质为非必输，调整为必输后，数据为空时打标记为<资质不全>
+        if((type.equals("jy") || type.equals("jc") || type.equals("zyry")) && "无资质要求".equals(permissionStatus)) {
+            return "资质不全";
+        }
+        return permissionStatus;
+    }
+
     public List<UserPermissionDto> getUserPermissionOfCurrentLogin(UserPermissionDto filter) {
         List<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionOfOneCompany(filter);
         result.forEach(d -> {