src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -343,14 +343,13 @@ public class ProjectServiceImpl implements ProjectService {
             if (projectModuleDO == null) {
                 return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST);
             }
-            if (projectModuleEditVO.getDescription() != null) {
+            HashMap<String, Object> descriptionMap = new HashMap<>();
-                HashMap<String, Object> descriptionMap = new HashMap<>();
+            descriptionMap.put("description", projectModuleEditVO.getDescription());
-                descriptionMap.put("description", projectModuleEditVO.getDescription());
+            projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
-                projectModuleEditVO.setDescription(gson.toJson(descriptionMap));
-            }
             projectModuleEditVO.setId(id);
             projectMapper.projectModuleEdit(projectModuleEditVO);
         }
+
         return ResultUtil.success("修改成功");
     }
 
@@ -367,13 +366,11 @@ public class ProjectServiceImpl implements ProjectService {
             JsonObject jsonObject = gson
                     .fromJson(projectChildDO.getDescription(), JsonObject.class);
             //改动简介发送消息
-            if (projectChildAddVO.getDescription() != null) {
+            if (!Objects.equals(projectChildAddVO.getDescription(), "")
-                if (!Objects.equals(projectChildAddVO.getDescription(), "")
+                    && !projectChildAddVO.getDescription()
-                        && !projectChildAddVO.getDescription()
+                    .equals(jsonObject.get("description").getAsString())) {
-                        .equals(jsonObject.get("description").getAsString())) {
+                messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
-                    messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
+                        .intValue(), id.intValue(), null, 2, request);
-                            .intValue(), id.intValue(), null, 2, request);
-                }
             } // 改动周期或工作量发送消息
             if ((projectChildAddVO.getCycle() != null
                     && projectChildDO.getCycle().equals(projectChildAddVO.getCycle()))
@@ -389,11 +386,9 @@ public class ProjectServiceImpl implements ProjectService {
                 messageService.messageAdd(projectMapper.getProjectIdBySysId(id)
                         .intValue(),  3, id.intValue(),  request);
             }
-            if (projectChildAddVO.getDescription() != null) {
+            HashMap<String, Object> descriptionMap = new HashMap<>();
-                HashMap<String, Object> descriptionMap = new HashMap<>();
+            descriptionMap.put("description", projectChildAddVO.getDescription());
-                descriptionMap.put("description", projectChildAddVO.getDescription());
+            projectChildAddVO.setDescription(gson.toJson(descriptionMap));
-                projectChildAddVO.setDescription(gson.toJson(descriptionMap));
-            }
 
             projectChildAddVO.setId(id);
             projectMapper.projectChildEditAll(projectChildAddVO);
@@ -465,22 +460,17 @@ public class ProjectServiceImpl implements ProjectService {
             if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) {
                 messageService.messageAdd(projectId.intValue(), 2, null, request);
             }
-            if (projectEdit.getDescription() != null) {
+            HashMap<String, Object> descriptionMap = new HashMap<>();
-                HashMap<String, Object> descriptionMap = new HashMap<>();
+            descriptionMap.put("description", projectEdit.getDescription());
-                descriptionMap.put("description", projectEdit.getDescription());
+            projectEdit.setDescription(gson.toJson(descriptionMap));
-                projectEdit.setDescription(gson.toJson(descriptionMap));
-            }
 
-            if (projectEdit.getDescription() != null) {
+            HashMap<String, Object> tagMap = new HashMap<>();
-                HashMap<String, Object> tagMap = new HashMap<>();
+            tagMap.put("tags", projectEdit.getTags().split(","));
-                tagMap.put("tags", projectEdit.getTags().split(","));
+            projectEdit.setTags(gson.toJson(tagMap));
-                projectEdit.setTags(gson.toJson(tagMap));
+
-            }
+            HashMap<String, Object> filesMap = new HashMap<>();
-            if (projectEdit.getDescription() != null) {
+            filesMap.put("URI", projectEdit.getFiles());
-                HashMap<String, Object> filesMap = new HashMap<>();
+            projectEdit.setFiles(gson.toJson(filesMap));
-                filesMap.put("URI", projectEdit.getFiles());
-                projectEdit.setFiles(gson.toJson(filesMap));
-            }
 
             projectEdit.setId(projectId);
             ProjectDO projectEdit1 = new ProjectDO();

src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml

@@ -40,7 +40,6 @@
             <if test="isDelete != null">
                 is_delete = #{isDelete},
             </if>
-            updated_at = CURRENT_TIMESTAMP
         </set>
         where id = #{id}
     </update>
@@ -106,7 +105,6 @@
         </set>
         where id = #{id}
     </update>
-
     <update id="projectChildEditAll">
         update organize_oa.oa_project_child
         <set>