From bd5ab921857b0871f7b7f5b96408dae7239c13a0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 13:25:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 37ed5f7..80b0e9e 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -74,7 +74,7 @@
         }
 
         // 姝ラ鏉$浉鍏�
-        resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
+        resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);
 
         return R.ok().add(resultObj);
     }
@@ -140,7 +140,13 @@
             }
         }
         if (!signUserId && !signDeptId){
-            wrapper.eq("user_id", getUserId());
+            if (getRole().getId()==1){
+                wrapper.or().eq("host_id",1);
+            }else if (getRole().getId()==2){
+                wrapper.eq("dept_id",getDeptId());
+            }else {
+                wrapper.eq("user_id", getUserId());
+            }
         }
         if (signHostId){
             wrapper.or().eq("host_id",1);
@@ -194,7 +200,7 @@
         User president6 = userService.selectById(processPermissions6.getUserId());       // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣6纭浜�
 
         reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
-        reimburseOnline.setMemberId(getUser().getId());
+        reimburseOnline.setMemberId(manager.getId());
 
         if (!reimburseOnlineService.insert(reimburseOnline)){
             return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");

--
Gitblit v1.9.1