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

@@ -479,7 +479,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
             dealLog.setDataId(dto.getId().toString());
             dealLog.setpDataId(dto.getParentid().toString());
-            dealLog.setDataType(1);
+            dealLog.setDataType(0);
             dealLog.setStatusFlag(0);
             dealLog.setTaskId(taskId);
             dealLog.setDataContent(JSONObject.toJSONString(dto));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxGroupSyncOperation.java

@@ -98,7 +98,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
         TabHaobanDepartment department = departmentService.getByWxId(dealParamMqDTO.getData(), dataPre.getWxEnterpriseId());
         if (department != null) {
             logger.info("已经同步过了:{}", dataPre.getDataId());
-            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门不存在");
+            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门存在");
             return;
         }