From 578c84810e978be343ef93f214da91c27917eef1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 15:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index e2e5ff3..554a0c2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -127,7 +127,7 @@
deptId = getDeptId();
userId = null;
}
- director = getUserId();
+// director = getUserId();
}
return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
@@ -268,6 +268,10 @@
return R.error("浣犳棤娉曟帴鍙栨鐢叉柟鍗曚綅!");
}
cstmr1.setDirector(getUserId());
+ cstmr.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ cstmr.setUserId(getUserId()); // 鎵�灞炰汉鍛�
+ cstmr.setUpdateBy(getUserId());
+ cstmr.setUpdateTime(new Date());
cstmrService.updateById(cstmr1);
return R.ok();
}
@@ -280,6 +284,11 @@
}
cstmr.setUpdateBy(getUserId());
cstmr.setUpdateTime(new Date());
+ if (!Cools.isEmpty(cstmr.getDirector())){
+ User director = userService.selectById(cstmr.getDirector());
+ cstmr.setDeptId(director.getDeptId());
+ cstmr.setUserId(director.getId());
+ }
cstmrService.updateById(cstmr);
return R.ok();
}
--
Gitblit v1.9.1