Browse Source

版本切换

anderx 1 year ago
parent
commit
73eeb3de35

+ 20 - 19
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1651,24 +1651,27 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getStatus()!=null)param.put("status",in.getStatus());
         //如果前端未传 0自己 1审核的参数,默认自己,在审核列表的时候判断Aid,在
         param.put("auditor",TokenManager.getAdminId());
-        if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
-             //财务经理查看权限
-             in.setProcessStatus(5);
-             param.put("auditor",TokenManager.getAdminId());
-         }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
-                 TokenManager.hasRole(AFTConstants.VICE_CEO)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
-             //财务管理员和超级管理员查看全部
-             in.setProcessStatus(6);
-             param.put("auditor",TokenManager.getAdminId());
-         }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
-             //0 设置为财务查看
-
-             param.put("auditor",TokenManager.getAdminId());
-             //如果是空设置为
-             if (in.getProcessStatus()==null)in.setProcessStatus(2);
-         }else {
-            in.setProcessStatus(0);
+        if(in.getProcessStatus()==null){
+            if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
+                //财务经理查看权限
+                in.setProcessStatus(5);
+                param.put("auditor",TokenManager.getAdminId());
+            }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+                    TokenManager.hasRole(AFTConstants.VICE_CEO)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+                //财务管理员和超级管理员查看全部
+                in.setProcessStatus(6);
+                param.put("auditor",TokenManager.getAdminId());
+            }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
+                //0 设置为财务查看
+
+                param.put("auditor",TokenManager.getAdminId());
+                //如果是空设置为
+                if (in.getProcessStatus()==null)in.setProcessStatus(2);
+            }else {
+                in.setProcessStatus(0);
+            }
         }
+        param.put("processStatus",in.getProcessStatus());
          if (in.getRoleType()==null){
              param.put("roleType",0);
          }else {
@@ -1679,8 +1682,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     param.put("aid",in.getAid());
                 }
         }
-
-        param.put("processStatus",in.getProcessStatus());
         if (in.getExamineStatus()!=null){
             param.put("examineStatus",in.getExamineStatus());
         }else {

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.11
-static.host=//172.16.1.187/1.3.12
+static.host=//static.jishutao.com/1.3.12
+#static.host=//172.16.1.187/1.3.12
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false