From a94949ee3e2746f6f6e9ee2a3fc08809c17d658a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 28 Nov 2024 10:14:23 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E8=B5=8B=E5=80=BC=E6=96=B9=E6=B3=95=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E5=BE=85=E5=8A=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7service=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=80=99=E9=80=89=E7=BB=84=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AFcontroller?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=9D=83=E9=99=90=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todoitem/service/impl/BizTodoItemServiceImpl.java | 2 +- .../erp/service/impl/ErpMaterialServiceImpl.java | 11 ++++------- .../system/controller/SysCustomerController.java | 3 +-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java index bd0ef09e..c06933d3 100644 --- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java +++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java @@ -185,7 +185,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService { // 查询候选用户组，系统用户角色视图，group是角色 List todoUserIdList = new ArrayList<>(); if("requisitioning".equals(module)||module.equals("expense") - ||module.equals("customerQuote")||module.equals("salesorder")||module.equals("customer")){ + ||module.equals("customerQuote")||module.equals("salesorder")||module.equals("customer")||module.equals("material")){ todoUserIdList = bizTodoItemMapper.selectTodoUserListsByTaskId(task.getId()); }else{ todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index ea944024..99a6e1f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -745,14 +745,11 @@ public class ErpMaterialServiceImpl implements IErpMaterialService private void buildAuthority(SysUser user, Map variables) { Set roleKeys = roleService.selectRoleKeys(user.getUserId()); // 角色不同审核人不同 - if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){ - variables.put("authority",4); - }else if(roleKeys.contains("gczgRole")){ - variables.put("authority",3); - }else if(roleKeys.contains("gcjlRole")){ - variables.put("authority",2); - }else if(roleKeys.contains("gcwyRole")){ + if(roleKeys.contains("gcwyRole")){ variables.put("authority",1); + }else if(roleKeys.contains("admin")||roleKeys.contains("gcjlRole") + ||roleKeys.contains("yfzjRole")||roleKeys.contains("dqzgRole")){ + variables.put("authority",2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 3a3bcffd..280a5a33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -309,7 +309,7 @@ public class SysCustomerController extends BaseController return AjaxResult.success("编辑成功,等待审核"); } - @RequiresPermissions("system:customer:audit") + @Log(title = "客户基本信息", businessType = BusinessType.UPDATE) @PostMapping("/audit") @ResponseBody @@ -419,7 +419,6 @@ public class SysCustomerController extends BaseController return getDataTable(list); } - @RequiresPermissions("system:customer:audit") @PostMapping("/operList") @ResponseBody public TableDataInfo list(SysCustomerOper sysCustomerOper)