From 06a23537f48e1bfd74fab2346798838afd9f30bf Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 17 十月 2023 15:00:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/BusinessTripController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 1578ccc..91b81bb 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));
}
@@ -142,9 +142,16 @@
businessTrip.setStatus(0);
businessTrip.setSettle(1);
- User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));
+
+ businessTrip.setMemberId(manager.getId());
businessTripService.insert(businessTrip);
return R.ok();
@@ -245,7 +252,12 @@
case 1:
// 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(businessTrip.getUserId());
- User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = user;
+ }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
@@ -268,8 +280,10 @@
// 淇敼瑙勫垝鍗曠姸鎬�
businessTrip.setSettle(2); // 鐢宠閫氳繃
+ businessTrip.setStatus(1);
businessTrip.setUpdateId(getUserId());
businessTrip.setUpdateTime(now);
+ businessTrip.setMemberId(businessTrip.getUserId());
if (!businessTripService.updateById(businessTrip)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1