Merge branch 'master' into developer

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

@@ -125,9 +125,10 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
                 dealSyncOperationApiService.cleanDiffrence(wxEnterpriseId, taskId);
                 WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
                 String corpid = wxEnterpriseDTO.getCorpid();
+                Integer externalFlag = wxEnterpriseDTO.getExternalFlag();
                 TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpid, null);
                 logger.info("同步通讯录完成，批量处理wx_user_id，corpid：{}", corpid);
-                if (corpid.length() > 20) {
+                if (corpid.length() > 20 || externalFlag == 1) {
                     //批量处理wx_user_id to wx_open_user_id
                     List<StaffDTO> staffDTOS = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId);
                     logger.info("useridToOpenuserid请求：corpid：{}", corpid);