mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改汇总可见性

master
OathK1per 2021-11-23 21:37:43 +08:00
parent b1f06ebe21
commit d000f7afe4
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/palmte/work/service/ProjectSummaryService.java
View File

@ -45,10 +45,6 @@ public class ProjectSummaryService {
public List<SettleBean> getList(ConcurrentHashMap<String, String> searchInfo, String time, Admin admin) { public List<SettleBean> getList(ConcurrentHashMap<String, String> searchInfo, String time, Admin admin) {
List<Project> projectList = null; 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 " + 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"; " (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 //项目可见性，根据角色和人员id
@ -56,7 +52,6 @@ public class ProjectSummaryService {
Integer adminId = admin.getId(); Integer adminId = admin.getId();
//自己创建的肯定能看见 //自己创建的肯定能看见
projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId); projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId);
}
List<Project> projects = new ArrayList<>(); List<Project> projects = new ArrayList<>();
List<Integer> projectInt = new ArrayList<>(); List<Integer> projectInt = new ArrayList<>();
for (Project project : projectList) { for (Project project : projectList) {