群链接编辑

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

@@ -50,7 +50,7 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
         log.info("保存群链接={}", JSON.toJSONString(list));
         List<HmLinkChatDTO> updateList = list.stream().filter(dto -> null != dto.getLinkChatId())
                 .collect(Collectors.toList());
-        List<Long> notDelIdList = updateList.stream().map(dto -> dto.getChatHmId()).collect(Collectors.toList());
+        List<Long> notDelIdList = updateList.stream().map(dto -> dto.getLinkChatId()).collect(Collectors.toList());
         log.info("不删除关联群活码={},{}", linkId, notDelIdList);
         String wxEnterpriseId = list.get(0).getWxEnterpriseId();
         String enterpriseId = list.get(0).getEnterpriseId();
@@ -81,11 +81,11 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
         }
 
         // 更新其他链接
-        List<Long> idList = list.stream().map(dto -> dto.getChatHmId()).collect(Collectors.toList());
-        idList.add(otherHmId);
+        List<Long> chatHmIdList = list.stream().map(dto -> dto.getChatHmId()).collect(Collectors.toList());
+        chatHmIdList.add(otherHmId);
         boolean addOther = false;
         if (null != link) {
-            idList.add(link.getOtherChatHmId());
+            chatHmIdList.add(link.getOtherChatHmId());
             if (!otherHmId.equals(link.getOtherChatHmId())) {
                 this.hmLinkChatMapper.delete(linkId, Arrays.asList(link.getOtherChatHmId()) , 1);
                 addOther = true;
@@ -110,10 +110,10 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
 
         // 统计活码关联的链接数量
         for (HmLinkChatDTO old : oldList) {
-            idList.add(old.getChatHmId());
+            chatHmIdList.add(old.getChatHmId());
         }
-        log.info("群id={}",idList);
-        this.groupChatHmService.updateLinkCount(wxEnterpriseId, idList);
+        log.info("群id={}",chatHmIdList);
+        this.groupChatHmService.updateLinkCount(wxEnterpriseId, chatHmIdList);
         return 0;
     }
 

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

@@ -95,6 +95,7 @@
 		chat_hm_id chatHmId,
 		member_type memberType 
 		from  tab_haoban_hm_link_chat where link_id = #{linkId} and wx_enterprise_id = #{wxEnterpriseId}  and enterprise_id = #{enterpriseId} and other_flag = 0
+		and delete_flag = 0
 	</select>