From f6c36a54e184d82b4fdb86982292f22e927fb668 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:58:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CstmrController.java           |    4 ++--
 src/main/webapp/static/js/order/order.js                                   |    2 ++
 src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java |    8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 0468066..f6c16ae 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -120,8 +120,8 @@
         }
         return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
                 , getHostId()
-                , deptId == null ? null : String.valueOf(deptId)
-                , userId == null ? getUserId() : userId
+                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+                , userId
                 , Cools.isEmpty(followerName) ? null : ids
                 , conditionName
                 , condition)
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 e92796c..80b0e9e 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -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);
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index db88a80..f7c27a0 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -389,6 +389,7 @@
                             layer.close(loadIndex);
                             if (res.code === 200){
                                 layer.close(dIndex);
+                                layer.closeAll()
                                 layer.msg(res.msg, {icon: 1});
                                 tableReload();
                             } else if (res.code === 403){
@@ -444,6 +445,7 @@
                             layer.close(loadIndex);
                             if (res.code === 200){
                                 layer.close(dIndex);
+                                layer.closeAll()
                                 layer.msg(res.msg, {icon: 1});
                                 tableReload();
                             } else if (res.code === 403){

--
Gitblit v1.9.1