去除数据重复bug

nightFragrance-massage/src/main/resources/mapper/massage/TXiangmuMapper.xml

@@ -72,22 +72,23 @@
     <select id="selectServiceOptionsPage" resultMap="ServiceOptionsVOMap">
         SELECT
             p.c_id AS id,
-            p.c_title AS title,
-            CASE
-                WHEN p.project_type = '1' THEN 0
-            ELSE 0
-            END AS productType,
-            p.d_price AS price,
+            ANY_VALUE(p.c_title) AS title,
+            CASE WHEN p.project_type = '1' THEN 0 ELSE 0 END AS productType,
+            ANY_VALUE(p.d_price) AS price,
             '广誉源' AS merchantName,
-            CAST(FLOOR(100000 + RAND() * 900000) AS UNSIGNED) AS merchantId,
-            CASE
-                WHEN #{dto.areaCode} IS NOT NULL THEN (SELECT name FROM area WHERE code = #{dto.areaCode})
-                ELSE agg.area_names
-                END AS serviceAreaName,
-            CASE
-                WHEN #{dto.areaCode} IS NOT NULL THEN #{dto.areaCode}
-                ELSE agg.area_codes
-                END AS serviceAreaCode
+            '10000' AS merchantId,
+            ANY_VALUE(
+                CASE
+                    WHEN #{dto.areaCode} IS NOT NULL THEN (SELECT name FROM area WHERE code = #{dto.areaCode})
+                    ELSE agg.area_names
+                END
+            ) AS serviceAreaName,
+            ANY_VALUE(
+                CASE
+                    WHEN #{dto.areaCode} IS NOT NULL THEN #{dto.areaCode}
+                    ELSE agg.area_codes
+                END
+            ) AS serviceAreaCode
         FROM t_xiangmu p
                  INNER JOIN (
             SELECT
@@ -114,6 +115,9 @@
             <if test="dto.productType == null">
                 AND p.project_type = 1
             </if>
+            <if test="dto.title != null and dto.title != ''">
+                AND p.c_title LIKE CONCAT('%', #{dto.title}, '%')
+            </if>
           AND EXISTS (
             SELECT 1
             FROM t_js j
@@ -123,7 +127,7 @@
               AND FIND_IN_SET(p.c_id, j.c_bh_list)
         )
         GROUP BY
-            p.c_id, p.c_title, p.project_type, p.d_price, #{dto.areaCode}, agg.area_codes, agg.area_names
+            p.c_id
         ORDER BY
             p.create_time DESC
     </select>