1

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java

@@ -136,6 +136,8 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
             page.getDataList().forEach((e) -> {
                 if (null != e.getMobile())
                     e.setMobile(hideAllPhoneNum(e.getMobile()));
+                if (Objects.nonNull(e.getCertId()))
+                    e.setCertId(hideAllIdCardNum(e.getCertId()));
                 if (null != e.getAuditResult())
                     e.setAuditResultName(CommonEnum.auditResult.getEnum(e.getAuditResult()).getDescription());
                 if (vo.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())) {
@@ -153,8 +155,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
                     self = total.subtract(gov);
                     e.setSelfFunding(self);
                 }
-                if (null != e.getCertId())
-                    e.setCertId(hideAllIdCardNum(e.getCertId()));
             });
         }
         return ResponseDataModel.ok(page);
@@ -239,7 +239,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
     public ResponseDataModel<Pagination<ComProjectAuditDTO>> getUnAssignProjectListByPage(@Validated ComProjectAuditQueryVO vo, BindingResult bindingResult) {
         vo.setAuditUnitId(SecurityUserHolder.getUnitId());
         vo.setKnowledgeId(null);
-        //vo.setSystemType(SecurityUserHolder.projectType());
         vo.setAuditType(1);
         vo.setAuditMethod(CommonEnum.auditMethod.last.getCode());
         return ResponseDataModel.ok(comProjectAuditService.getUnAssignProjectListByPage(vo));