From 4f5900215fd1468172ba6b7e54fa4116c111b8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 9 Mar 2023 00:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=A7=92=E8=89=B2=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=9D=A5=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=8E=89=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/functions/FunctionService.java | 18 ++++++++++++++----
 .../systemConfig/SystemConfigService.java      | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

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<Function> findRoleFunction(String pnumber)throws Exception{
-        FunctionExample example = new FunctionExample();
-        example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pnumber)
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("Sort");
         List<Function> 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<SystemConfig> list = getSystemConfig();
+        if(list.size()>0) {
+            String flag = list.get(0).getMultiLevelApprovalFlag();
+            if(("1").equals(flag)) {
+                multiLevelApprovalFlag = true;
+            }
+        }
+        return multiLevelApprovalFlag;
+    }
 }