From dd4754c274ca8bff6e9f70487691af2075a3bdee Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 6 Apr 2023 22:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectlib/manage/ProjectLibManage.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

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.*;
 
 /**
  * <p>
@@ -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<ProjectLibListItemVO> 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 <String> regionCodes = regionCacheHelper.listChildRegionCodeList(user.getRegionCode(),
+                            RegionConst.RL_CITY);
+                    query.in(Project::getAreaCode,regionCodes);
+                }else{
+                    query.eq(Project::getAreaCode,user.getRegionCode());
+                }
                 break;
             case VISITOR:
                 //访客可以看全市的