From 09ee5added9d59e90310a2586e846137ea597b19 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 13:15:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/BusinessTripOtherController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/BusinessTripOtherController.java b/src/main/java/com/zy/crm/manager/controller/BusinessTripOtherController.java
index 8b1f0a0..e170568 100644
--- a/src/main/java/com/zy/crm/manager/controller/BusinessTripOtherController.java
+++ b/src/main/java/com/zy/crm/manager/controller/BusinessTripOtherController.java
@@ -53,7 +53,7 @@
EntityWrapper<BusinessTripOther> 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(businessTripOtherService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -89,10 +89,16 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",getHostId());
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
- wrapper.or().eq("host_id",1);
+ wrapper.or().eq("host_id",getHostId());
}
}
@@ -125,6 +131,7 @@
manager = getUser();
}
businessTripOther.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));
+ businessTripOther.setMemberId(manager.getId());
businessTripOtherService.insert(businessTripOther);
return R.ok();
@@ -231,6 +238,7 @@
businessTripOther.setStatus(1);
businessTripOther.setUpdateId(getUserId());
businessTripOther.setUpdateTime(now);
+ businessTripOther.setMemberId(businessTripOther.getUserId());
if (!businessTripOtherService.updateById(businessTripOther)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1