用户律师需求开发

alien-entity/src/main/java/shop/alien/mapper/LawyerAiInteractionLogMapper.java

@@ -88,8 +88,8 @@ public interface LawyerAiInteractionLogMapper extends BaseMapper<LawyerAiInterac
             "lawyer_ai_interaction_log " +
             "WHERE " +
             "client_user_id = #{clientUserId} " +
+            "AND delete_flag = 0 " +
             "ORDER BY created_time DESC " +
-            "LIMIT #{page} , #{size}" +
             "</script>")
     List<LawyerAiInteractionLog> getLogList(
             @Param("clientUserId") Integer clientUserId,

alien-store/src/main/java/shop/alien/store/service/impl/LawyerAiInteractionLogServiceImpl.java

@@ -14,6 +14,7 @@ import shop.alien.entity.store.LawyerAiInteractionLog;
 import shop.alien.entity.store.vo.LawyerAiInteractionLogVo;
 import shop.alien.mapper.LawyerAiInteractionLogMapper;
 import shop.alien.store.service.LawyerAiInteractionLogService;
+import shop.alien.util.common.ListToPage;
 
 import java.util.*;
 
@@ -170,16 +171,14 @@ public class LawyerAiInteractionLogServiceImpl extends ServiceImpl<LawyerAiInter
             return R.data(result);
         }
         result.put("result","删除失败");
-        return null;
+        return R.data(result);
     }
 
     @Override
-    public R<IPage<LawyerAiInteractionLog>> getLogList(Integer page, Integer size , Integer clientUserId) {
-        List<LawyerAiInteractionLog> list = aiInteractionLogMapper.getLogList(page,size,clientUserId);
-        IPage<LawyerAiInteractionLog> pageResult = new Page<>(page, size);
-        pageResult.setRecords(list);
-        pageResult.setTotal(list.size());
-        return R.data(pageResult);
+    public R<IPage<LawyerAiInteractionLog>> getLogList(Integer clientUserId,Integer page, Integer size) {
+        List<LawyerAiInteractionLog> list = aiInteractionLogMapper.getLogList(clientUserId,page,size);
+        IPage<LawyerAiInteractionLog> iPag =ListToPage.setPage(list,page, size);
+        return R.data(iPag);
     }