diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index 465134b4..edd3a5ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -530,7 +530,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") || roleKeys.contains("fzjlRole") || roleKeys.contains("admin") - || roleKeys.contains("cwshRole")){ + || roleKeys.contains("cwshRole")|| roleKeys.contains("hrjlRole")){ Set users = sysUserlist.stream() .map(SysUser::getLoginName) // 提取每个 SysUser 对象的 name 属性 .collect(Collectors.toSet()); diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html index 672d69d1..86a2a2f9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html @@ -170,20 +170,20 @@ if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "0"){ // 编辑 // actions.push(' 编辑 '); - actions.push(' 出行费用 '); + actions.push(' 出行费用 '); } if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "1"){ // 核准 - actions.push(' 核准 '); + actions.push(' 核准 '); } if(row.auditStatus == "1"&& row.useStatus == "1"){ // 作废 - actions.push(' 作废'); + actions.push(' 作废'); } // 已作废 if(row.useStatus=="2" && !row.restoreInstanceId){ // 恢复 - actions.push(' 恢复 '); + actions.push(' 恢复 '); } // 有流程实例id if (row.instanceId) { @@ -196,13 +196,14 @@ } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ],