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 09782af..a68e2e6 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 @@ -220,11 +220,23 @@ public class ProjectController extends JeecgController // 12 已验收 //13 已结项 - //财政管理员看到要立项的数据 + if ("shenbaoren_role".equals(loginUser.getRoleCode())) { + queryWrapper.eq("create_by", loginUser.getUsername()); + queryWrapper.in("project_status", 11); + } + if ("faren_admin".equals(loginUser.getRoleCode())) { + queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 11); + } + if ("quxian_admin".equals(loginUser.getRoleCode())) { + queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 11); + } + if ("caizheng_admin".equals(loginUser.getRoleCode())) { + queryWrapper.in("project_status", 11); + } if ("kejiju_admin".equals(loginUser.getRoleCode())) { queryWrapper.in("budget_status", 10, 11); - } else { - queryWrapper.in("project_status", 11); } IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); @@ -264,12 +276,38 @@ public class ProjectController extends JeecgController // 12 已验收 //13 已结项 - //财政管理可以看到要验收的数据 + /*//财政管理可以看到要验收的数据 if ("kejiju_admin".equals(loginUser.getRoleCode())) { queryWrapper.in("project_status", 11, 12); } else { queryWrapper.in("project_status", 12); + }*/ + + // 11 已立项 + // 12 已验收 + //13 已结项 + + if ("shenbaoren_role".equals(loginUser.getRoleCode())) { + queryWrapper.eq("create_by", loginUser.getUsername()); + queryWrapper.in("project_status", 12); } + if ("faren_admin".equals(loginUser.getRoleCode())) { + queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 12); + } + if ("quxian_admin".equals(loginUser.getRoleCode())) { + queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 12); + } + if ("caizheng_admin".equals(loginUser.getRoleCode())) { + queryWrapper.in("project_status", 12); + } + if ("kejiju_admin".equals(loginUser.getRoleCode())) { + queryWrapper.in("budget_status", 11,12); + } + + + IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); } @@ -296,12 +334,32 @@ public class ProjectController extends JeecgController // 12 已验收 //13 已结项 - //财政管理可以看到要验收的数据 + /*//财政管理可以看到要验收的数据 if ("kejiju_admin".equals(loginUser.getRoleCode())) { queryWrapper.in("project_status", 12, 13); } else { queryWrapper.in("project_status", 13); + }*/ + + if ("shenbaoren_role".equals(loginUser.getRoleCode())) { + queryWrapper.eq("create_by", loginUser.getUsername()); + queryWrapper.in("project_status", 13); } + if ("faren_admin".equals(loginUser.getRoleCode())) { + queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 13); + } + if ("quxian_admin".equals(loginUser.getRoleCode())) { + queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); + queryWrapper.in("project_status", 13); + } + if ("caizheng_admin".equals(loginUser.getRoleCode())) { + queryWrapper.in("project_status", 13); + } + if ("kejiju_admin".equals(loginUser.getRoleCode())) { + queryWrapper.in("budget_status", 12,13); + } + IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); }