From 978a3733aedaaa505867b64edfbe1f6caedbc798 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 09:56:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/BusinessTripController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
index 9454b40..fb2281d 100644
--- a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
+++ b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
@@ -56,7 +56,7 @@
EntityWrapper<BusinessTrip> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
-// wrapper.or().eq("member_id",getUserId());
+ wrapper.or().eq("member_id",getUserId());
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(businessTripService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -92,7 +92,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);
@@ -150,6 +156,8 @@
}
businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));
+
+ businessTrip.setMemberId(manager.getId());
businessTripService.insert(businessTrip);
return R.ok();
@@ -281,6 +289,7 @@
businessTrip.setStatus(1);
businessTrip.setUpdateId(getUserId());
businessTrip.setUpdateTime(now);
+ businessTrip.setMemberId(businessTrip.getUserId());
if (!businessTripService.updateById(businessTrip)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1