Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !803

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -554,11 +554,16 @@ public class GroupChatServiceImpl implements GroupChatService {
             TabGroupChat chat = new TabGroupChat();
             chat.setGroupChatId(groupChatId);
             chat.setWxEnterpriseId(wxEnterpriseId);
+            String enterpriseId = this.matchGicEnterpriseId(wxEnterpriseId, null, null);
+            chat.setGicFlag(0);
+            if(StringUtils.isNotBlank(enterpriseId)) {
+                chat.setEnterpriseId(enterpriseId);
+                chat.setGicFlag(1);
+            }
             chat.setWxChatId(wxChatId);
             chat.setChatStatus(chatStatus);
             chat.setCreateTime(new Date());
             chat.setUpdateTime(new Date());
-            chat.setGicFlag(0);
             chat.setDeleteFlag(0);
             chat.setTotalCount(0);
             if (syncDetailFlag) {
@@ -913,7 +918,7 @@ public class GroupChatServiceImpl implements GroupChatService {
     }
 
     private void updateWxChatIdDk(String wxEnterpriseId, String staffId) {
-        logger.info("更新代开chatid={},staff={}", wxEnterpriseId, staffId);
+        logger.info("更新代开wxEid={},staff={}", wxEnterpriseId, staffId);
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(),
                 SecretTypeEnum.CUSTOMIZED_APP.getVal());