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 @@