From f6ca237cd6ca53693557ba0c26fe70bc43d5f5cd Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 21 Nov 2024 15:45:45 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E7=89=88=E4=B8=87=E6=9D=90=E9=9C=80?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=B8=BA=EF=BC=9A?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=B2=A1=E6=9C=89=E9=87=87=E8=B4=AD=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E8=BF=99=E4=B8=AA=E8=81=8C=E4=BD=8D=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E7=94=B1=E5=89=AF=E6=80=BB=E5=AE=A1=E6=89=B9=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF=EF=BC=8C=E4=BB=A5=E5=90=8E=E6=9C=89=E6=AD=A4=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=BA=EF=BC=9A=E9=87=87=E8=B4=AD=E5=91=98-?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=8F=E7=90=86-=E5=89=AF=E6=80=BB=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=E5=89=AF=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E5=AE=A1=E6=89=B9=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysSupplierServiceImpl.java | 11 ++++++----- .../{taskCgzgVerify.html => taskFzjlVerify.html} | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) rename ruoyi-admin/src/main/resources/templates/system/supplier/{taskCgzgVerify.html => taskFzjlVerify.html} (98%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java index 2bd093d1..3a2149b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java @@ -441,15 +441,16 @@ public class SysSupplierServiceImpl implements ISysSupplierService{ private void buildAuthority(SysUser user, Map variables) { Set roleKeys = roleService.selectRoleKeys(user.getUserId()); + variables.put("cgjlExist",false); + + // 角色不同审核人不同 if(roleKeys.contains("cgyRole")){ variables.put("authority",1); }else if(roleKeys.contains("cgjlRole")){ - variables.put("authority",2); - }else if(roleKeys.contains("cgzgRole")){ + variables.put("cgjlExist",true); + }else if(roleKeys.contains("admin")){ variables.put("authority",3); - } - // 角色不同审核人不同 - if(roleKeys.contains("admin")){ + }else if(roleKeys.contains("fzjlRole")){ variables.put("authority",4); } } diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/supplier/taskFzjlVerify.html similarity index 98% rename from ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html rename to ruoyi-admin/src/main/resources/templates/system/supplier/taskFzjlVerify.html index c2537d61..96d36e91 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/taskFzjlVerify.html @@ -8,7 +8,7 @@
-
+ @@ -328,9 +328,9 @@
- +
- @@ -354,14 +354,14 @@