Merge branch 'bugfix/2023-09-04' into 'master'

Bugfix/2023 09 04

See merge request !1430

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

@@ -545,6 +545,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             return "没有数据同步或权限没设置全部";
         }
         logger.info("企微部门数={}",list.size());
+        syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.group_sync.getVal());
         List<TabHaobanPreDealLog> dealLogList = list.stream().map(dto -> {
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
             dealLog.setDataId(dto.getId().toString());
@@ -915,6 +916,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             return false;
         }
         if(type==0) {
+            this.syncTaskService.updateTaskStatus(taskId,4) ;
             logger.info("部门成功,开始同步成员:{}", taskId);
             String key = "haoban_sync_department_task_" + taskId;
             RedisUtil.lock(key, 3L);

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

@@ -203,7 +203,6 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
                 return dealLog;
             }).collect(Collectors.toList());
             this.preDealService.insert(preDealLogList);
-            this.syncTaskService.updateTaskStatus(taskId,4) ;
         }
         return null ;
     }

haoban-manage3-service/src/test/java/ChatTest.java

@@ -7,6 +7,7 @@ import com.gic.haoban.manage.api.dto.notify.qdto.NotifyMessageBatchQDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.service.HandoverOperationApiService;
 import com.gic.haoban.manage.api.service.QywxTagApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -35,10 +36,13 @@ public class ChatTest {
 
     @Autowired
     private HandoverOperationApiService handoverOperationApiService;
+    @Autowired
+    private StaffApiService staffApiService ;
 
     @Test
     public void test() {
-        this.handoverOperationApiService.dealQywxEnterpriseHandoverMq("ca66a01b79474c40b3e7c7f93daf1a3b") ;
+        this.staffApiService.updateStaffHead("ca66a01b79474c40b3e7c7f93daf1a3b","d7c29cb654b543d1966181c2ec2186ea","https://pic01-10001430.image.myqcloud.com/04564abc-5e82-4ba7-9ef3-39803438bb2c") ;
+       // this.handoverOperationApiService.dealQywxEnterpriseHandoverMq("ca66a01b79474c40b3e7c7f93daf1a3b") ;
     }
 
     @Test