1

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

@@ -27,6 +27,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
+import static com.yiboshi.science.utils.StringUtil.hideAllPhoneNum;
+
 
 @Api(tags = "com-expert", description = "专家表")
 @RestController
@@ -58,6 +61,8 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
         Pagination<ComExpertDTO> page = comExpertService.getListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
             page.getDataList().forEach((e) -> {
+                e.setCertId(hideAllIdCardNum(e.getCertId()));
+                e.setMobile(hideAllPhoneNum(e.getMobile()));
                 e.setExpertStateName(CommonEnum.loginState.getEnum(e.getExpertState()).getDescription());
                 List<ComExpertSpecDTO> ExpertSpecList = comExpertSpecService.getListByExpertId(e.getId());
                 e.setSpecList(ExpertSpecList);
@@ -104,8 +109,6 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
         Pagination<ComExpertDTO> page = comExpertService.getListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
             page.getDataList().forEach((e) -> {
-//                e.setCertId(hideAllIdCardNum(e.getCertId()));
-//                e.setMobile(concealAllPhoneNum(e.getMobile()));
                 e.setAssignInfo(ComProjectAssignService.getAssignCount(e.getId()));
             });
         }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -109,9 +109,6 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
         ComExpertDTO dto = comExpertDAO.getExpertById(id);
         if (null != dto) {
             dto.setSpecList(comExpertSpecService.getListByExpertId(id));
-            dto.setCertId(hideAllIdCardNum(dto.getCertId()));
-//            if (Objects.nonNull(dto.getMobile()))
-//                dto.setMobile(hideAllPhoneNum(dto.getMobile()));
         }
         return dto;
     }