From 22e79558da8db6716b9f19908ebf7eb10cad8cd6 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Mon, 22 Apr 2024 19:29:18 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E6=8C=87=E5=AE=9A=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/services/impl/ProjectServiceImpl.java  | 54 +++++++++++--------
 .../com/jsl/oa/mapper/ProjectMapper.xml       |  2 +
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
index acdc889..fbcc26d 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
@@ -343,13 +343,14 @@ public class ProjectServiceImpl implements ProjectService {
             if (projectModuleDO == null) {
                 return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST);
             }
-            HashMap<String, Object> descriptionMap = new HashMap<>();
-            descriptionMap.put("description", projectModuleEditVO.getDescription());
-            projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
+            if (projectModuleEditVO.getDescription() != null) {
+                HashMap<String, Object> descriptionMap = new HashMap<>();
+                descriptionMap.put("description", projectModuleEditVO.getDescription());
+                projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
+            }
             projectModuleEditVO.setId(id);
             projectMapper.projectModuleEdit(projectModuleEditVO);
         }
-
         return ResultUtil.success("修改成功");
     }
 
@@ -366,11 +367,13 @@ public class ProjectServiceImpl implements ProjectService {
             JsonObject jsonObject = gson
                     .fromJson(projectChildDO.getDescription(), JsonObject.class);
             //改动简介发送消息
-            if (!Objects.equals(projectChildAddVO.getDescription(), "")
-                    && !projectChildAddVO.getDescription()
-                    .equals(jsonObject.get("description").getAsString())) {
-                messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
-                        .intValue(), id.intValue(), null, 2, request);
+            if (projectChildAddVO.getDescription() != null) {
+                if (!Objects.equals(projectChildAddVO.getDescription(), "")
+                        && !projectChildAddVO.getDescription()
+                        .equals(jsonObject.get("description").getAsString())) {
+                    messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
+                            .intValue(), id.intValue(), null, 2, request);
+                }
             } // 改动周期或工作量发送消息
             if ((projectChildAddVO.getCycle() != null
                     && projectChildDO.getCycle().equals(projectChildAddVO.getCycle()))
@@ -386,9 +389,11 @@ public class ProjectServiceImpl implements ProjectService {
                 messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
                         .intValue(),  3, id.intValue(),  request);
             }
-            HashMap<String, Object> descriptionMap = new HashMap<>();
-            descriptionMap.put("description", projectChildAddVO.getDescription());
-            projectChildAddVO.setDescription(gson.toJson(descriptionMap));
+            if (projectChildAddVO.getDescription() != null) {
+                HashMap<String, Object> descriptionMap = new HashMap<>();
+                descriptionMap.put("description", projectChildAddVO.getDescription());
+                projectChildAddVO.setDescription(gson.toJson(descriptionMap));
+            }
 
             projectChildAddVO.setId(id);
             projectMapper.projectChildEditAll(projectChildAddVO);
@@ -460,17 +465,22 @@ public class ProjectServiceImpl implements ProjectService {
             if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) {
                 messageService.messageAdd(projectId.intValue(), 2, null, request);
             }
-            HashMap<String, Object> descriptionMap = new HashMap<>();
-            descriptionMap.put("description", projectEdit.getDescription());
-            projectEdit.setDescription(gson.toJson(descriptionMap));
+            if (projectEdit.getDescription() != null) {
+                HashMap<String, Object> descriptionMap = new HashMap<>();
+                descriptionMap.put("description", projectEdit.getDescription());
+                projectEdit.setDescription(gson.toJson(descriptionMap));
+            }
 
-            HashMap<String, Object> tagMap = new HashMap<>();
-            tagMap.put("tags", projectEdit.getTags().split(","));
-            projectEdit.setTags(gson.toJson(tagMap));
-
-            HashMap<String, Object> filesMap = new HashMap<>();
-            filesMap.put("URI", projectEdit.getFiles());
-            projectEdit.setFiles(gson.toJson(filesMap));
+            if (projectEdit.getDescription() != null) {
+                HashMap<String, Object> tagMap = new HashMap<>();
+                tagMap.put("tags", projectEdit.getTags().split(","));
+                projectEdit.setTags(gson.toJson(tagMap));
+            }
+            if (projectEdit.getDescription() != null) {
+                HashMap<String, Object> filesMap = new HashMap<>();
+                filesMap.put("URI", projectEdit.getFiles());
+                projectEdit.setFiles(gson.toJson(filesMap));
+            }
 
             projectEdit.setId(projectId);
             ProjectDO projectEdit1 = new ProjectDO();
diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
index 5d5a2b5..df59060 100644
--- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
@@ -40,6 +40,7 @@
             <if test="isDelete != null">
                 is_delete = #{isDelete},
             </if>
+            updated_at = CURRENT_TIMESTAMP
         </set>
         where id = #{id}
     </update>
@@ -105,6 +106,7 @@
         </set>
         where id = #{id}
     </update>
+
     <update id="projectChildEditAll">
         update organize_oa.oa_project_child
         <set>