From bb38f6c6274d4e2cc656a005fd7ba526566adcfc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 11 十一月 2025 17:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

---
 ruoyi-system/src/main/resources/mapper/system/TMicroWishMapper.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TMicroWishMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TMicroWishMapper.xml
index 87f12b2..6ad3638 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TMicroWishMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TMicroWishMapper.xml
@@ -26,7 +26,29 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, app_user_id, wish_type, wish_description, pictures, contact_person, contact_phone, address, status, audit_remark, process_result, process_pictures, process_time, create_time, update_time, create_by, update_by, disabled
+        id, app_user_id, wish_type, wish_description, pictures, contact_person, contact_phone, address, status, audit_remark,
+          process_result, process_pictures, process_time, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.vo.TMicroWishVO">
+        select
+        <include refid="Base_Column_List"/>
+            from t_micro_wish
+        <where>
+            <if test="query.wishType != null">
+                and wish_type = #{query.wishType}
+            </if>
+            <if test="query.status != null">
+                and status = #{query.status}
+            </if>
+            <if test="query.contactPerson != null and query.contactPerson != ''">
+                and contact_person like concat('%',#{query.contactPerson},'%')
+            </if>
+            <if test="query.contactPhone != null and query.contactPhone != ''">
+                and contact_phone like concat('%',#{query.contactPhone},'%')
+            </if>
+            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        ORDER BY create_time DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1