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

Feature/社群

See merge request !675

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkChatServiceImpl.java

@@ -58,7 +58,6 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
             for (HmLinkChatDTO dto : addList) {
                 TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, dto);
                 entity.setLinkChatId(UniqueIdUtils.uniqueLong());
-                entity.setChatHmId(UniqueIdUtils.uniqueLong());
                 entity.setLinkId(linkId);
                 this.hmLinkChatMapper.insert(entity);
             }

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

@@ -41,6 +41,9 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
     @Override
     public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
         Page<GroupChatHmBO> page = this.groupChatHmService.listPage(qdto, basePageInfo);
+        if (CollectionUtils.isEmpty(page.getResult())) {
+            return ServiceResponse.success(new Page<GroupChatHmDTO>());
+        }
         Page<GroupChatHmDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatHmDTO.class);
         return ServiceResponse.success(resultPage);
     }

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

@@ -256,7 +256,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
 
         // 如果是社群链接
         if (link.getLinkType() == HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
-            log.info("群链接");
+            log.info("群链接,linkId={}",link.getLinkId());
             return this.getLinkChatHmFromWxa(wxEnterpriseId, enterpriseId, mixPhone, unionid, memberId, link, retDTO);
         }
 

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

@@ -197,7 +197,7 @@ public class GroupChatHmController {
     }
 
     @RequestMapping("page")
-    public RestResponse<Object> page(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
+    public RestResponse<Object> page(@RequestBody ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
@@ -257,8 +257,8 @@ public class GroupChatHmController {
             String logContent = "废弃群活码【" + respDTO.getResult().getChatHmCode() + "-" + respDTO.getResult().getName()
                     + "】";
             GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
-            if(page==1) {
-                GicLogRecordEvaluationContext.setOptPage("群活码-详情") ;
+            if (page == 1) {
+                GicLogRecordEvaluationContext.setOptPage("群活码-详情");
             }
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();