From d6f7953e01e320551626197476e60dccecb47809 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 28 Mar 2023 17:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
index 6008c3d..52086d6 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
@@ -276,7 +276,6 @@ public class AnnualPlanLibManage {
             log.warn("没有取到权限信息 当前查询 没有权限条件");
             return loginUser;
         }
-        Boolean isOrgAdmin = Boolean.FALSE;
         switch (currentUserDataScope.get().getRole()){
             case ORDINARY_USER:
                 //普通用户 只能看到自己单位去申报的
@@ -284,10 +283,7 @@ public class AnnualPlanLibManage {
                 break;
             case ORG_ADMIN:
                 //单位管理员 看到自己单位去申报的 + 待预审的主管单位是自己单位的项目
-                query.and(q1 -> q1.eq(Project::getBuildOrgCode ,loginUser.getOrganizationCode()).or(q2 ->
-                        q2.eq(Project::getStage,ProjectStatusEnum.NOT_APPROVED.getCode())
-                                .eq(Project::getStatus,ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode())
-                                .eq(Project::getSuperOrgCode,loginUser.getOrganizationCode())));
+                query.eq(Project::getBuildOrgCode ,loginUser.getOrganizationCode());
                 break;
             case SUPER_ADMIN:
                 //超级管理员 看到丽水全市的 并且也要判断他 同时是不是单位管理员
@@ -296,9 +292,6 @@ public class AnnualPlanLibManage {
                 //区域管理员 看到自己区域的项目
                 query.eq(Project::getAreaCode,loginUser.getRegionCode());
                 break;
-            case VISITOR:
-                //访客可以看全市的
-                break;
             default:
                 //没有权限的话 就让它查不到
                 query.eq(Project::getId,"NULL");