From a1f4599096beaa9cbbb24534bc608c73811db226 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 13:44:28 +0800
Subject: [PATCH] #跟进任务
---
src/main/java/com/zy/crm/manager/controller/BusinessTripController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 5ec6e3d..9454b40 100644
--- a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
+++ b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
@@ -100,7 +100,7 @@
}
@RequestMapping(value = "/businessTrip/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鍑哄樊鐢宠")
public R add(BusinessTrip businessTrip) {
if (Cools.isEmpty(businessTrip)){
return R.error();
@@ -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())));
@@ -151,7 +156,7 @@
}
@RequestMapping(value = "/businessTrip/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鍑哄樊鐢宠")
public R update(BusinessTrip businessTrip){
if (Cools.isEmpty(businessTrip) || null==businessTrip.getId()){
return R.error();
@@ -189,7 +194,7 @@
}
@RequestMapping(value = "/businessTrip/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍑哄樊鐢宠")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
businessTripService.deleteById(id);
@@ -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