diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java index e3a02fc..674b112 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java @@ -115,7 +115,7 @@ public class RegionLimitHelperImpl extends AbstractRegionLimitHelper { regionContainsBO.setParentRegionTreeLevel(expertAdminRegion.getRegionLevel()); regionContainsBOList.add(regionContainsBO); }*/ - return null; + return new ArrayList<>(); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java index 81ccb68..648a42c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java @@ -68,7 +68,7 @@ public class ExpertMetaApplyManage { private final IExpertMetaApplyService iMetaApplyService; private final IExpertDictionaryService expertDictionaryService; - // private final IExpertAdminManageService ExpertAdminManageService; +// private final IExpertAdminManageService ExpertAdminManageService; private final RegionCacheHelper regionCacheHelper; private final IExpertUserFullInfoService userFullInfoService; private final DictionaryCache dictionaryCache; @@ -89,7 +89,9 @@ public class ExpertMetaApplyManage { ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(req, viewRegions); // TODO // List filterExpertUserIdList = expertAdminManageService.filterExpertUserIdList(queryCmd); - List filterExpertUserIdList = new ArrayList<>(); + List expertUserFullInfoList = userFullInfoService.list(); + // TODO 获取所有的专家审核列表 + List filterExpertUserIdList = expertUserFullInfoList.stream().map(ExpertUserFullInfo::getUserId).distinct().collect(Collectors.toList()); if (CollUtil.isEmpty(filterExpertUserIdList)) { return PageVo.empty(); }