From f45f5479f6e5a34702f44434a4a3141fd2c76d17 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Tue, 22 Oct 2024 17:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E7=94=9F?=
 =?UTF-8?q?=E6=B6=AF=E8=A7=84=E5=88=92=E7=9B=B8=E5=85=B3=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=90=86=E8=B4=A2=E6=96=B9=E6=A1=88=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SynthesisPlanController.java                | 3 ++-
 .../money_management/mapper/SynthesisPlanClientMapper.java | 7 ++++---
 src/main/resources/mapper/CaseInfoMapper.xml               | 2 +-
 src/main/resources/mapper/SynthesisPlanClientMapper.xml    | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java
index 6699aa6..e2ef66d 100644
--- a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java
+++ b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java
@@ -348,9 +348,10 @@ public class SynthesisPlanController {
     @PostMapping("/getPotentialCustomerList")
     public ResultEntity<PageInfo<SynthesisPlanClient>> getPotentialCustomerList(@RequestParam Integer index,
                                                                                 @RequestParam Integer size,
+                                                                                @RequestParam String userId,
                                                                                 @RequestParam(required = false) String keyWord) {
         PageHelper.startPage(index, size);
-        List<SynthesisPlanClient> list = synthesisPlanClientMapper.getPotentialCustomerList(keyWord);
+        List<SynthesisPlanClient> list = synthesisPlanClientMapper.getPotentialCustomerList(userId,keyWord);
         PageInfo pageInfo = new PageInfo(list);
         return new ResultEntity<PageInfo<SynthesisPlanClient>>(pageInfo);
     }
diff --git a/src/main/java/com/sztzjy/money_management/mapper/SynthesisPlanClientMapper.java b/src/main/java/com/sztzjy/money_management/mapper/SynthesisPlanClientMapper.java
index a335723..5adc0df 100644
--- a/src/main/java/com/sztzjy/money_management/mapper/SynthesisPlanClientMapper.java
+++ b/src/main/java/com/sztzjy/money_management/mapper/SynthesisPlanClientMapper.java
@@ -2,12 +2,12 @@ package com.sztzjy.money_management.mapper;
 
 import com.sztzjy.money_management.entity.SynthesisPlanClient;
 import com.sztzjy.money_management.entity.SynthesisPlanClientExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface SynthesisPlanClientMapper {
     long countByExample(SynthesisPlanClientExample example);
@@ -38,7 +38,8 @@ public interface SynthesisPlanClientMapper {
     @Select("select count(*) from synthesis_plan_client where userid=#{userId} and submit_status='已审核'")
     Integer selectYiYouTotalCount(String userId);
 
-    List<SynthesisPlanClient> getPotentialCustomerList(@Param("keyWord") String keyWord);
+    List<SynthesisPlanClient> getPotentialCustomerList(@Param("userId") String userId,
+                                                       @Param("keyWord") String keyWord);
 
     @Select("select sum(use_time) from synthesis_plan_client where userid=#{userId}")
     Integer getTotalUseTime(String userId);
diff --git a/src/main/resources/mapper/CaseInfoMapper.xml b/src/main/resources/mapper/CaseInfoMapper.xml
index c964635..7f69da0 100644
--- a/src/main/resources/mapper/CaseInfoMapper.xml
+++ b/src/main/resources/mapper/CaseInfoMapper.xml
@@ -357,7 +357,7 @@
             <if test="type !=null and type !=''">
                 and manage_money_matters_type = #{type}
             </if>
-            ORDER BY add_time desc
         </where>
+        ORDER BY add_time desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/SynthesisPlanClientMapper.xml b/src/main/resources/mapper/SynthesisPlanClientMapper.xml
index f750d88..9666c92 100644
--- a/src/main/resources/mapper/SynthesisPlanClientMapper.xml
+++ b/src/main/resources/mapper/SynthesisPlanClientMapper.xml
@@ -536,6 +536,7 @@
         SELECT * FROM synthesis_plan_client
         WHERE get_status = 'true'
          AND (submit_status IN ('未提交', '未审核') OR submit_status IS NULL)
+         AND userid = #{userId}
         <if test="keyWord !=null and keyWord !=''">
             AND
             name LIKE CONCAT ('%',#{keyWord},'%')