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

Feature/社群

See merge request !751

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

@@ -155,7 +155,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         }
         List<Long> hmIdList = this.groupChatHmRelationMapper.listChatHmId(groupChatId);
         if (CollectionUtils.isEmpty(hmIdList)) {
-            logger.info("群加满后,处理活码,取未关联活码,chatid={}", groupChatId);
+            logger.info("群加满后,处理活码,群未关联活码,chatid={}", groupChatId);
             return;
         }
         for (Long chatHmId : hmIdList) {
@@ -170,7 +170,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             }
             List<TabGroupChatHmRelation> chatRelation = this.groupChatHmRelationMapper.listByChatHmId(chatHmId);
             if (CollectionUtils.isEmpty(chatRelation)) {
-                logger.info("群活码无关联群,chatHmId={}", chatHmId);
+                logger.info("活码无关联群,chatHmId={}", chatHmId);
                 continue;
             }
             this.handleAutoCreateRoom(wxEnterpriseId, secretSetting.getSecretVal(), hm, chatRelation, groupChatId);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -374,6 +374,8 @@ public class LoginController extends WebBaseController {
         webLoginDTO.setLoginChannel(loginChannel);
         webLoginDTO.setClerkId(clerk.getClerkId());
         String roleId = this.rightService.getRoleIdByClerkId(clerk.getClerkId()) ;
+        webLoginDTO.setIsClique(en.getIsClique());
+        webLoginDTO.setCliqueId(en.getCliqueId());
         webLoginDTO.setRoleId(roleId);
         webLoginDTO.setClerkName(clerk.getClerkName());
         webLoginDTO.setBrandName(en.getBrandName());
@@ -476,6 +478,9 @@ public class LoginController extends WebBaseController {
             logger.info("切换商户失败,商户已过期,eid={},phone={}", enterpriseId, phoneNumber);
             return this.fail(endMessage);
         }
+        EnterpriseDTO en = this.enterpriseService.getEnterpriseById(clerk.getEnterpriseId()) ;
+        loginUser.setIsClique(en.getIsClique());
+        loginUser.setCliqueId(en.getCliqueId());
         loginUser.setEnterpriseId(enterpriseId);
         loginUser.setClerkId(clerk.getClerkId());
         loginUser.setClerkName(clerk.getClerkName());