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

Feature/社群

See merge request !711

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

@@ -382,11 +382,13 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
 
     @Override
     public void updateLinkCount(String wxEnterpriseId, List<Long> chatHmIdList) {
+        logger.info("更新活码链接数1={},{}",wxEnterpriseId,chatHmIdList);
         if (CollectionUtils.isNotEmpty(chatHmIdList)) {
             Set<Long> set = new HashSet<>(chatHmIdList);
             List<HmLinkChatDTO> linkGroup = this.hmLinkChatService.getLinkCountForHm(wxEnterpriseId,
                     new ArrayList<>(set));
             List<Long> allList = linkGroup.stream().map(dto -> dto.getLinkChatId()).collect(Collectors.toList());
+            logger.info("更新活码链接数2={},{}",wxEnterpriseId,allList);
             linkGroup.forEach(dto -> {
                 Long hmId = dto.getChatHmId();
                 int count = dto.getLinkCount();
@@ -394,6 +396,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             });
             for (Long id : chatHmIdList) {
                 if (!allList.contains(id)) {
+                    logger.info("更新活码链接数3={},{}",wxEnterpriseId,id);
                     this.groupChatHmMapper.updateLinkCount(id, 0);
                 }
             }

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkChatMapper.xml

@@ -63,7 +63,7 @@
 	<update id="delete">
 		UPDATE tab_haoban_hm_link_chat SET delete_flag = 1 , update_time =now()  WHERE link_id = #{linkId}
 		<if test="null != idList and idList.size > 0">
-			and link_chat_id in
+			and chat_hm_id in
 			<foreach collection="idList" item="item" separator="," index="index"
 				close=")" open="(">
 				#{item}