修复管理端客服消息被撤回仍在聊天列表显示问题

src/main/java/com/sqx/modules/chats/service/ChatsServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.chats.service;
 
 
+import cn.hutool.core.util.StrUtil;
+import com.sqx.common.utils.Constant;
 import com.sqx.modules.chats.entity.Chats;
 import com.sqx.modules.chats.entity.ChatsContent;
 import com.sqx.modules.chats.respository.ChatContentRepository;
@@ -50,28 +52,7 @@ public class ChatsServiceImpl implements ChatsService {
      */
     @Override
     public Result findAll(Long storeId, String userName,Long type,String starTime,String endTime,String read/*受否已读*/) {
-        //构造自定义查询条件
-//        Specification<Chats> queryCondition = new Specification<Chats>() {
-//            @Override
-//            public Predicate toPredicate(Root<Chats> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-//                List<Predicate> predicateList = new ArrayList<>();
-//                predicateList.add(criteriaBuilder.equal(root.get("storeId"), storeId));
-//                if (StringUtils.isNotEmpty(userName)){
-//                    predicateList.add(criteriaBuilder.like(root.get("userName"), "%"+userName+"%"));
-//                }
-//                if (StringUtils.isNotEmpty(userName)){
-//                    predicateList.add(criteriaBuilder.like(root.get("userName"), "%"+userName+"%"));
-//                }
-//                if (StringUtils.isNotEmpty(userName)){
-//                    predicateList.add(criteriaBuilder.like(root.get("userName"), "%"+userName+"%"));
-//                }
-//                if (StringUtils.isNotEmpty(userName)){
-//                    predicateList.add(criteriaBuilder.like(root.get("userName"), "%"+userName+"%"));
-//                }
-//                return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
-//            }
-//        };
-        List<Chats> list=new ArrayList<>();
+        List<Chats> list;
         if ("1".equals(read)){
             list = chatsMapper.findRead(storeId,userName,type,starTime,endTime);
         }else if("2".equals(read)){
@@ -84,7 +65,7 @@ public class ChatsServiceImpl implements ChatsService {
         List<ChatsContent> allContent = chatContentRepository.findAll();
         for (Chats c : list) {
             for (ChatsContent cc : allContent) {
-                if (c.getChatId().equals(cc.getChatId())){
+                if (c.getChatId().equals(cc.getChatId()) && StrUtil.equals(cc.getRecall(), Constant.NO)){
                     c.setContent(cc.getContent());
                     c.setContentTime(cc.getCreateTime());
                 }