优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -322,24 +322,29 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         // 向workProjectChange插入内容
         List<WorkProjectChange> workProjectChanges = new ArrayList<>();
         if (!StringUtils.isBlank(modifyProjectVo.getDeptIdReason())) {
-            WorkProjectChange workProjectChange = new WorkProjectChange();
-            workProjectChange.setProjectId(modifyProjectVo.getProjectId());
-            workProjectChange.setModifyTime(new Date());
-            workProjectChange.setChangeType(6);
-            workProjectChange.setModifyBefore(workDeptService.getById(workProject.getDeptId()).getDeptName());
-            workProjectChange.setModifyAfter(workDeptService.getById(modifyProjectVo.getDeptId()).getDeptName());
-            workProjectChange.setReason(modifyProjectVo.getDeptIdReason());
-            workProjectChanges.add(workProjectChange);
+            if (!workProject.getDeptId().equals(modifyProjectVo.getDeptId())) {
+                WorkProjectChange workProjectChange = new WorkProjectChange();
+                workProjectChange.setProjectId(modifyProjectVo.getProjectId());
+                workProjectChange.setModifyTime(new Date());
+                workProjectChange.setChangeType(6);
+                workProjectChange.setModifyBefore(workDeptService.getById(workProject.getDeptId()).getDeptName());
+                workProjectChange.setModifyAfter(workDeptService.getById(modifyProjectVo.getDeptId()).getDeptName());
+                workProjectChange.setReason(modifyProjectVo.getDeptIdReason());
+                workProjectChanges.add(workProjectChange);
+            }
         }
         if (!StringUtils.isBlank(modifyProjectVo.getManagerIdReason())) {
-            WorkProjectChange workProjectChange = new WorkProjectChange();
-            workProjectChange.setProjectId(modifyProjectVo.getProjectId());
-            workProjectChange.setModifyTime(new Date());
-            workProjectChange.setChangeType(5);
-            workProjectChange.setModifyBefore(workUserService.getById(workProject.getManagerId()).getName());
-            workProjectChange.setModifyAfter(workUserService.getById(modifyProjectVo.getManagerId()).getName());
-            workProjectChange.setReason(modifyProjectVo.getManagerIdReason());
-            workProjectChanges.add(workProjectChange);
+            if (!workProject.getManagerId().equals(modifyProjectVo.getManagerId())) {
+                WorkProjectChange workProjectChange = new WorkProjectChange();
+                workProjectChange.setProjectId(modifyProjectVo.getProjectId());
+                workProjectChange.setModifyTime(new Date());
+                workProjectChange.setChangeType(5);
+                workProjectChange.setModifyBefore(workUserService.getById(workProject.getManagerId()).getName());
+                workProjectChange.setModifyAfter(workUserService.getById(modifyProjectVo.getManagerId()).getName());
+                workProjectChange.setReason(modifyProjectVo.getManagerIdReason());
+                workProjectChanges.add(workProjectChange);
+            }
+
         }
         if (!StringUtils.isBlank(modifyProjectVo.getStartTimeReason())) {
             WorkProjectChange workProjectChange = new WorkProjectChange();