From a6535d6c9889a4240d037367db3c481a679e15a0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 09:09:54 +0800
Subject: [PATCH] #一键出差、报销完善相关
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index b980ec9..b0e1c83 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -139,10 +139,16 @@
plan.setUpdateBy(getUserId());
plan.setUpdateTime(now);
plan.setStatus(0);
+ plan.setStep(1);
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
- User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
PlanType planType = planTypeService.selectById(plan.getPlanType());
User planLeader = planTypeService.findPlanLeader(planType);
plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager, planLeader)));
@@ -337,7 +343,12 @@
// case 1:
// // 鏈粍缁勯暱瀹℃牳
// User user = userService.selectById(plan.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())) {
//
// // 鏌ユ壘瑙勫垝缁勯暱
@@ -604,7 +615,7 @@
wrapper.eq("status",1);
int type =1;
- if (getUser().getNickname().equals("鏉庝笘璞�3绾�")){
+ if (getUser().getNickname().equals("鏉庝笘璞�2绾�")){
type=2;
}
--
Gitblit v1.9.1