diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index d17c755..db00266 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -7,6 +7,8 @@ import com.google.common.collect.Lists; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.common.constant.CommonConst; +import com.ningdatech.pmapi.common.constant.RegionConst; +import com.ningdatech.pmapi.common.helper.RegionCacheHelper; import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter; import com.ningdatech.pmapi.common.util.ExcelDownUtil; @@ -36,10 +38,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; /** *

@@ -59,6 +58,8 @@ public class ProjectLibManage { private final IProjectRenewalFundDeclarationService renewalFundDeclarationService; private final ProcessExecuteChainHandle processExecuteHandle; + private final RegionCacheHelper regionCacheHelper; + private final UserInfoHelper userInfoHelper; public PageVo projectLibList(ProjectListReq req) { @@ -234,8 +235,14 @@ public class ProjectLibManage { //超级管理员 看到丽水全市的 并且也要判断他 同时是不是单位管理员 break; case REGION_MANAGER: - //区域管理员 看到自己区域的项目 - query.eq(Project::getAreaCode,user.getRegionCode()); + //区域管理员 看到自己区域的项目 如果是市本级 就看全市的 + if(RegionConst.RC_LS.equals(user.getRegionCode())){ + Collection regionCodes = regionCacheHelper.listChildRegionCodeList(user.getRegionCode(), + RegionConst.RL_CITY); + query.in(Project::getAreaCode,regionCodes); + }else{ + query.eq(Project::getAreaCode,user.getRegionCode()); + } break; case VISITOR: //访客可以看全市的