From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 5 +++++
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 5 ++++-
src/main/webapp/static/js/priOnline2/priOnline.js | 2 +-
3 files changed, 10 insertions(+), 2 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 9beaad8..554a0c2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -284,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();
}
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index 84ae90d..f020640 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -246,7 +246,10 @@
User userUp = userService.selectById(plan.getUserId());
priOnline2.setAssistantHostSign(plan.getAssistantHostSign());
priOnline2.setAssistantPlanId(plan.getAssistantPlanId());
- priOnline2.setHostPlanId(plan.getHostPlanId());
+ priOnline2.setHostPlanId(plan.getId());
+ if (plan.getAssistantHostSign()==1){
+ priOnline2.setHostPlanId(plan.getHostPlanId());
+ }
//涓氬姟鍛�
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 5c12009..250ab8d 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -609,7 +609,7 @@
case "uploadLink":
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
- var planIdSign = data.id;
+ var planIdSign = data.itemId;
if (data.assistantHostSign==1){
planIdSign = data.hostPlanId;
}
--
Gitblit v1.9.1