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);