diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java index 4e1454fe..08153d3e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java @@ -10,6 +10,7 @@ import com.jsh.erp.datasource.mappers.FunctionMapper; import com.jsh.erp.datasource.mappers.FunctionMapperEx; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; +import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; @@ -37,6 +38,8 @@ public class FunctionService { @Resource private UserService userService; @Resource + private SystemConfigService systemConfigService; + @Resource private LogService logService; public Function getFunction(long id)throws Exception { @@ -204,12 +207,19 @@ public class FunctionService { } public List findRoleFunction(String pnumber)throws Exception{ - FunctionExample example = new FunctionExample(); - example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pnumber) - .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("Sort"); List list=null; try{ + Boolean multiLevelApprovalFlag = systemConfigService.getMultiLevelApprovalFlag(); + FunctionExample example = new FunctionExample(); + FunctionExample.Criteria criteria = example.createCriteria(); + criteria.andEnabledEqualTo(true).andParentNumberEqualTo(pnumber) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + if("0".equals(pnumber)) { + if(!multiLevelApprovalFlag) { + criteria.andUrlNotEqualTo("/workflow"); + } + } + example.setOrderByClause("Sort"); list =functionsMapper.selectByExample(example); }catch(Exception e){ JshException.readFail(logger, e); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index baa2f3ef..b287286d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -216,4 +216,21 @@ public class SystemConfigService { } return amountApprovalFlag; } + + /** + * 获取多级审核开关 + * @return + * @throws Exception + */ + public boolean getMultiLevelApprovalFlag() throws Exception { + boolean multiLevelApprovalFlag = false; + List list = getSystemConfig(); + if(list.size()>0) { + String flag = list.get(0).getMultiLevelApprovalFlag(); + if(("1").equals(flag)) { + multiLevelApprovalFlag = true; + } + } + return multiLevelApprovalFlag; + } }