From 3d6dc4f08917a0a58db94ab22ce0da9615de7dcc Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Fri, 21 Feb 2025 11:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86--=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=B5=84=E6=BA=90=E4=BD=8D=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6,int=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/SysSourceController.java        |  2 ++
 .../mapper/system/SysSourceMapper.xml         | 26 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
index 49455376..b9a6a008 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
@@ -72,6 +72,8 @@ public class SysSourceController extends BaseController {
     @GetMapping("/getAllSource")
     public TableDataInfo getAllSource(SysSource sysSource) {
 
+        System.out.println("搜索条件: "+sysSource.getCity()+sysSource.getScenic()+sysSource.getcX()+sysSource.getcY());
+
 
         startPage();
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml
index f7700742..464018f3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml
@@ -115,23 +115,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         on s.order_id = o.order_id
         <where>
             <if test="sourceId != null "> and s.source_id = #{sourceId}</if>
-            <if test="cityId != null "> and city_id = #{cityId}</if>
+<!--&#45;&#45;             <if test="cityId != null "> and city_id = #{cityId}</if>-->
             <if test="city != null  and city != ''"> and city = #{city}</if>
-            <if test="scenicId != null "> and scenic_id = #{scenicId}</if>
+<!--&#45;&#45;             <if test="scenicId != null "> and scenic_id = #{scenicId}</if>-->
             <if test="scenic != null  and scenic != ''"> and scenic = #{scenic}</if>
             <if test="part != null  and part != ''"> and part = #{part}</if>
-            <if test="scale != null  and scale != ''"> and scale = #{scale}</if>
-            <if test="coordinate != null  and coordinate != ''"> and coordinate = #{coordinate}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
+<!--&#45;&#45;             <if test="scale != null  and scale != ''"> and scale = #{scale}</if>-->
+<!--&#45;&#45;             <if test="coordinate != null  and coordinate != ''"> and coordinate = #{coordinate}</if>-->
+<!--&#45;&#45;             <if test="price != null  and price != ''"> and price = #{price}</if>-->
             <if test="sourceStatus != null  and sourceStatus != ''"> and source_status = #{sourceStatus}</if>
-            <if test="workAddress != null  and workAddress != ''"> and work_address = #{workAddress}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="bBought != null "> and b_bought = #{bBought}</if>
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-             <if test="workId != null "> and work_id = #{workId}</if>
-              <if test="cX != null "> and c_x = #{cX}</if>
-               <if test="cY != null "> and c_y = #{cY}</if>
+<!--&#45;&#45;             <if test="workAddress != null  and workAddress != ''"> and work_address = #{workAddress}</if>-->
+<!--&#45;&#45;             <if test="startTime != null "> and start_time = #{startTime}</if>-->
+<!--&#45;&#45;             <if test="endTime != null "> and end_time = #{endTime}</if>-->
+<!--&#45;&#45;             <if test="bBought != null "> and b_bought = #{bBought}</if>-->
+<!--&#45;&#45;             <if test="orderId != null "> and order_id = #{orderId}</if>-->
+<!--             <if test="workId != null "> and work_id = #{workId}</if>-->
+              <if test="cX != 0 "> and c_x = #{cX}</if>
+              <if test="cY != 0 "> and c_y = #{cY}</if>
         </where>