From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml
index 5a89096..9f80107 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/feedback/mapper/FeedbackMapper.xml
@@ -5,7 +5,7 @@
<id property="id" column="id"/>
<result property="content" column="content"/>
<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
- <result property="phone" column="phone"/>
+ <result property="phone" column="userPhone"/>
<result property="reportUserName" column="real_name"/>
@@ -18,11 +18,11 @@
<result property="isDeleted" column="is_deleted"/>
</resultMap>
<select id="selectMyPage" resultMap="vo">
- SELECT SF.*,u.real_name FROM SM_FEEDBACK SF
+ SELECT SF.*,u.real_name,u.phone userPhone FROM SM_FEEDBACK SF
LEFT JOIN BLADE_USER U ON U.ID = SF.CREATE_USER
WHERE SF.IS_DELETED = 0
<if test="vo.createUser != null and vo.createUser !=''">
- SF.CREATE_USER = #{vo.createUser}
+ AND SF.CREATE_USER = #{vo.createUser}
</if>
ORDER BY SF.CREATE_TIME DESC
</select>
--
Gitblit v1.9.3