Merge branch 'master' into developer

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

@@ -380,6 +380,21 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             externalUseridLogMapper.insertBatch(tabExternalUseridLogList);
             //最后一页
             if (isLastPage) {
+                updateAgreeExternalUseridFlag(corpid, wxEnterpriseId);
+            }
+            log.info("更新新的外部联系人id mq,end");
+        } catch (Exception e) {
+            log.info("更新新的外部联系人id mq报错：{},res:{}", e.getMessage(), res, e);
+        }
+
+    }
+
+    /**
+     * 更新状态
+     * @param corpid
+     * @param wxEnterpriseId
+     */
+    private void updateAgreeExternalUseridFlag(String corpid, String wxEnterpriseId) {
         //serviceCorpid 默认为：达摩网络
         boolean flag = qywxUserApiService.finishExternalUseridMigration(corpid, config.getCorpid());
         log.info("更新新的外部联系人id最后一页，设置迁移完成：flag:{}", flag);
@@ -394,12 +409,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             externalUseridLogMapper.updateOldExternalUserId(wxEnterpriseId);
         }
     }
-            log.info("更新新的外部联系人id mq,end");
-        } catch (Exception e) {
-            log.info("更新新的外部联系人id mq报错：{},res:{}", e.getMessage(), res, e);
-        }
-
-    }
 
     /**
      * 更新新的外部联系人id
@@ -425,6 +434,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             PageInfo<TabHaobanExternalClerkRelated> tabHaobanWxEnterprisePageInfo = pageExternalByWxEnterpriseId(wxEnterpriseId, pageNum, 1000);
             List<TabHaobanExternalClerkRelated> enterprisePageInfoList = tabHaobanWxEnterprisePageInfo.getList();
             if (CollectionUtils.isEmpty(enterprisePageInfoList)) {
+                if (pageNum == 1) {
+                    log.info("如果没有好友，直接转换完成..corpid:{}",corpid);
+                    updateAgreeExternalUseridFlag(corpid,wxEnterpriseId);
+                }
                 break;
             }
             pageNum++;