From 026245895bdd18ab647a8a35649dc162c7927c8e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 13:05:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 df316ea..85dfa9a 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -116,19 +116,29 @@
         plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
         plan.setSettle(1);  // 1.寮�濮�
 
-        planService.insert(plan);
+        if (!planService.insert(plan)) {
+            throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+        }
         return R.ok();
     }
 
 	@RequestMapping(value = "/plan/update/auth")
 	@ManagerAuth
-    public R update(Plan plan){
-        if (Cools.isEmpty(plan) || null==plan.getId()){
+    public R update(@RequestParam Map<String, Object> param){
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
             return R.error();
         }
+        // pre
+        Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
+        param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
         plan.setUpdateBy(getUserId());
         plan.setUpdateTime(new Date());
-        planService.updateById(plan);
+
+        plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
+
+        if (!planService.updateById(plan)) {
+            throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+        }
         return R.ok();
     }
 

--
Gitblit v1.9.1