From 6adcbd883a65f98e4572b1a551eb9b3a8b1f3b68 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 10 Jul 2024 11:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/dao/MassageTypeDao.java |  2 +-
 .../mapper/artificer/MassageTypeDao.xml       | 27 -------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java b/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java
index f73ccd2..e7ed425 100644
--- a/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java
+++ b/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java
@@ -23,5 +23,5 @@ public interface MassageTypeDao extends BaseMapper<MassageType> {
 
     IPage<MassageType> selectMassageTypeChildrenPage(Page<MassageType> pages, Integer status, String city, Integer sort, Integer authentication, Integer by, String title, Long artificerId, Long parentId, Long classifyId);
 
-    IPage<?> selectMassageTypeQyPage(Page<MassageType> pages, String city, String title);
+    IPage<?> selectMassageTypeQyPage(Page<MassageType> pages, @Param("city")String city, @Param("title")String title);
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/artificer/MassageTypeDao.xml b/src/main/resources/mapper/artificer/MassageTypeDao.xml
index 5a3fcfd..857854e 100644
--- a/src/main/resources/mapper/artificer/MassageTypeDao.xml
+++ b/src/main/resources/mapper/artificer/MassageTypeDao.xml
@@ -69,21 +69,6 @@
         from massage_type m
         left join sys_dict s on s.id=m.classify_id
         where 1=1 and qy_type = 1
-        <if test="artificerId!=null">
-            and m.massage_type_id not  in (select massage_type_id from artificer_massage where artificer_id=#{artificerId})
-        </if>
-        <if test="status!=null and status!=0">
-            and m.status=#{status}
-        </if>
-        <if test="parentId==null or parentId==0">
-            and (m.parent_id is null or m.parent_id=0)
-        </if>
-        <if test="parentId!=null and parentId!=0">
-            and m.parent_id=#{parentId}
-        </if>
-        <if test="classifyId!=null and classifyId!=0">
-            and m.classify_id=#{classifyId}
-        </if>
         <if test="city!=null and city!=''">
             and (m.city like concat('%',#{city},'%') or m.city='不限')
         </if>
@@ -91,18 +76,6 @@
             and m.title like concat('%',#{title},'%')
         </if>
         ) a
-        <if test="by!=null and by==1">
-            order by price desc
-        </if>
-        <if test="by!=null and by==2">
-            order by price asc
-        </if>
-        <if test="by!=null and by==3">
-            order by sales desc
-        </if>
-        <if test="by!=null and by==4">
-            order by massageScore desc
-        </if>
     </select>
 
     <select id="selectMassageTypeChildrenPage" resultType="com.sqx.modules.artificer.entity.MassageType">