From 465fc7e88eb02ada97e796f1b22322eb35838b86 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Tue, 5 Nov 2024 18:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=90=E4=BA=A4=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E3=80=81=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2011.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java index d2fe7ab..1157281 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java @@ -152,17 +152,30 @@ public class ProjectController extends JeecgController customeRuleMap.put("projectStatus", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("budgetStatus", QueryRuleEnum.LIKE_WITH_OR); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap(), customeRuleMap); Page page = new Page(pageNo, pageSize); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //('科技主管部门待提交', '1'); + //('科技主管部门已提交', '2'); + //('不受理', '3'); + //('已受理', '4'); + //('申请人待提交', '5'); + //('申请单位待提交', '6'); + //('市科技局待提交', '7'); + //('市科技局已提交', '8'); + //('财政主管理部门待审核', '9'); + //('财政主管理部门审核通过', '10'); + //申请单位数据 if ("faren_admin".equals(loginUser.getRoleCode())) { queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); + queryWrapper.eq("status_project", 5); } // 区/县管理员数据 if ("quxian_admin".equals(loginUser.getRoleCode())) { queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); + queryWrapper.likeRight("status_project", 6); } if ("kejiju_admin".equals(loginUser.getRoleCode())) { queryWrapper.in("project_status", 7, 8);