Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -182,8 +182,11 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         editList.forEach(syncSingleDealDTO -> {
             // TODO: 2020/4/9  需要优化
             TabHaobanDepartment department = departmentService.selectById(syncSingleDealDTO.getDepartmentId());
-            department.setParentDepartmentId(syncSingleDealDTO.getParentDepartmentId());
-            departmentApiService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
+            if (!department.getParentDepartmentId().equals(syncSingleDealDTO.getParentDepartmentId())) {
+                department.setParentDepartmentId(syncSingleDealDTO.getParentDepartmentId());
+                departmentApiService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
+            }
+
         });
     }