From d000f7afe4d954250b0e8408fad9a9e286300d1e Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 23 Nov 2021 21:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E6=80=BB=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/service/ProjectSummaryService.java   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
index 72103ca..b34a949 100644
--- a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
@@ -45,18 +45,13 @@ public class ProjectSummaryService {
 
     public List<SettleBean> getList(ConcurrentHashMap<String, String> searchInfo, String time, Admin admin) {
         List<Project> projectList = null;
-        if (admin.getRoleLevel() <= 2 || admin.getRoleLevel() == 4) {
-            String sql = "select proj.id, proj.name, proj.approve_status_settle from project_settle_cost psc left join project proj on psc.project_id = proj.id where psc.time = ? group by proj.id order by proj.id asc";
-            projectList = pagination.find(sql, Project.class, time);
-        } else {
-            String sql = "select proj.id, proj.name, proj.approve_status_settle from project_settle_cost psc left join project proj on psc.project_id = proj.id where psc.time = ? and " +
-                    " (proj.creator_id=? OR proj.id in (SELECT pv1.project_id FROM project_visible pv1 WHERE pv1.type=1 AND pv1.tid=? UNION SELECT pv2.project_id FROM project_visible pv2 WHERE pv2.type=2 AND pv2.tid=?)) group by proj.id order by proj.id asc";
-            //项目可见性，根据角色和人员id
-            int roleId = admin.getRoleId();
-            Integer adminId = admin.getId();
-            //自己创建的肯定能看见
-            projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId);
-        }
+        String sql = "select proj.id, proj.name, proj.approve_status_settle from project_settle_cost psc left join project proj on psc.project_id = proj.id where psc.time = ? and " +
+                " (proj.creator_id=? OR proj.id in (SELECT pv1.project_id FROM project_visible pv1 WHERE pv1.type=1 AND pv1.tid=? UNION SELECT pv2.project_id FROM project_visible pv2 WHERE pv2.type=2 AND pv2.tid=?)) group by proj.id order by proj.id asc";
+        //项目可见性，根据角色和人员id
+        int roleId = admin.getRoleId();
+        Integer adminId = admin.getId();
+        //自己创建的肯定能看见
+        projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId);
         List<Project> projects = new ArrayList<>();
         List<Integer> projectInt = new ArrayList<>();
         for (Project project : projectList) {