From 8225e18c416b46754d9cea3b7c0b57abd10ec30e Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Sun, 10 Nov 2024 19:14:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=2011.1?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectController.java | 68 +++++++++++++++++-- 1 file changed, 63 insertions(+), 5 deletions(-) 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); } From f2f6ee095eb87d0f1cadccd940328a15de6e4a9c Mon Sep 17 00:00:00 2001 From: Gitea Date: Sun, 10 Nov 2024 19:20:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=83=A8=E9=97=A8org=5Fc?= =?UTF-8?q?ategory=E5=AD=97=E6=AE=B5=E6=9A=82=E6=97=B6=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/SysDepartServiceImpl.java | 2 +- .../src/views/system/usersetting/UserSetting.data.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 001b79f..6ae93e1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -212,7 +212,7 @@ public class SysDepartServiceImpl extends ServiceImpl