同步通讯录 同步加锁

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

@@ -198,7 +198,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
         //同步成功 进入门店处理
         if (syncTask.getStatusFlag().equals(SyncTaskStatusEnum.group_sync.getVal())) {
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.store_sync.getVal());
-            List<TabHaobanPreDealLog> dealLogs = preDealService.listRebuildByTaskId(taskId, PreDealTypeEnum.store.getVal());
+            List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.pre.getVal());
             if (CollectionUtils.isEmpty(dealLogs)) {
                 storeSyncOperation.checkDepartmentTask(taskId);
 //                syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());

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

@@ -88,6 +88,7 @@ public class StoreSyncOperation implements BaseSyncOperation {
         }
         if (null == pParentDepartment) {
             logger.info("不存在该父部门：c:{},p:{}", dataPre.getDataId(), dataPre.getpDataId());
+            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "父部们不存在");
             return;
         }
         StoreDTO storeDTO = storeService.getStore(dealParamMqDTO.getData());
@@ -191,7 +192,7 @@ public class StoreSyncOperation implements BaseSyncOperation {
         if (syncTask.getStatusFlag().equals(SyncTaskStatusEnum.store_sync.getVal())) {
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.clerk_sync.getVal());
             //是否有成员 需要处理
-            List<TabHaobanPreDealLog> dealLogs = preDealService.listRebuildByTaskId(taskId, PreDealTypeEnum.clerk.getVal());
+            List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.pre.getVal());
             if (CollectionUtils.isEmpty(dealLogs)) {
                 clerkSyncOperation.checkDepartmentTask(taskId);
 //                syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());