From 98fc24d02c9c6f951ac4afe956a07984526637df Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 07 十月 2023 15:16:46 +0800
Subject: [PATCH] #出差相关
---
src/main/java/com/zy/crm/manager/controller/BusinessTripController.java | 15 +++++++++++++--
1 files changed, 13 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 1578ccc..9454b40 100644
--- a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
+++ b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
@@ -142,7 +142,12 @@
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())));
@@ -245,7 +250,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,6 +278,7 @@
// 淇敼瑙勫垝鍗曠姸鎬�
businessTrip.setSettle(2); // 鐢宠閫氳繃
+ businessTrip.setStatus(1);
businessTrip.setUpdateId(getUserId());
businessTrip.setUpdateTime(now);
if (!businessTripService.updateById(businessTrip)) {
--
Gitblit v1.9.1