From 09961fee00c4bdc2ab3d58c382bf4f72f2f1c21d Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Wed, 23 Oct 2024 11:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=88=E4=BE=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CaseController.java                 |  3 ++-
 .../money_management/mapper/CaseInfoMapper.java    |  6 +++++-
 src/main/resources/mapper/CaseInfoMapper.xml       | 14 ++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sztzjy/money_management/controller/CaseController.java b/src/main/java/com/sztzjy/money_management/controller/CaseController.java
index 2a99c53..c5ec043 100644
--- a/src/main/java/com/sztzjy/money_management/controller/CaseController.java
+++ b/src/main/java/com/sztzjy/money_management/controller/CaseController.java
@@ -176,10 +176,11 @@ public class CaseController {
     @AnonymousAccess
     private ResultEntity<PageInfo<CaseInfo>> getCaseInfoList(@RequestParam Integer index,
                                                              @RequestParam Integer size,
+                                                             @RequestParam String schoolId,
                                                              @RequestParam(required = false) String keyWord,
                                                              @RequestParam(required = false) String type) {
         PageHelper.startPage(index, size);
-        List<CaseInfo> caseInfoList = caseInfoMapper.getCaseInfoList(keyWord, type);
+        List<CaseInfo> caseInfoList = caseInfoMapper.getCaseInfoList(schoolId, keyWord, type);
         PageInfo pageInfo = new PageInfo(caseInfoList);
         return new ResultEntity<PageInfo<CaseInfo>>(pageInfo);
     }
diff --git a/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java b/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java
index 46e41bc..eefa2e8 100644
--- a/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java
+++ b/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java
@@ -2,10 +2,12 @@ package com.sztzjy.money_management.mapper;
 
 import com.sztzjy.money_management.entity.CaseInfo;
 import com.sztzjy.money_management.entity.CaseInfoExample;
+
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 @Mapper
 public interface CaseInfoMapper {
     long countByExample(CaseInfoExample example);
@@ -36,5 +38,7 @@ public interface CaseInfoMapper {
 
     int updateByPrimaryKey(CaseInfo record);
 
-    List<CaseInfo> getCaseInfoList(@Param("keyWord") String keyWord,@Param("type") String type);
+    List<CaseInfo> getCaseInfoList(@Param("schoolId") String schoolId,
+                                   @Param("keyWord") String keyWord,
+                                   @Param("type") String type);
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/CaseInfoMapper.xml b/src/main/resources/mapper/CaseInfoMapper.xml
index 7f69da0..c233323 100644
--- a/src/main/resources/mapper/CaseInfoMapper.xml
+++ b/src/main/resources/mapper/CaseInfoMapper.xml
@@ -349,15 +349,17 @@
 
     <!--下面为自己手动添加的xml-->
     <select id="getCaseInfoList" resultMap="ResultMapWithBLOBs">
-        select * from case_info
+        SELECT * FROM case_info
         <where>
-            <if test="keyWord !=null and keyWord !=''">
-                customer_name like CONCAT ('%',#{keyWord},'%') or id_card like CONCAT ('%',#{keyWord},'%')
+            source IN ('999999999', #{schoolId})
+            <if test="keyWord != null and keyWord != ''">
+                AND
+                (customer_name LIKE CONCAT('%', #{keyWord}, '%') OR id_card LIKE CONCAT('%', #{keyWord}, '%'))
             </if>
-            <if test="type !=null and type !=''">
-                and manage_money_matters_type = #{type}
+            <if test="type != null and type != ''">
+                AND manage_money_matters_type LIKE CONCAT('%', #{type}, '%')
             </if>
         </where>
-        ORDER BY add_time desc
+        ORDER BY add_time DESC
     </select>
 </mapper>
\ No newline at end of file