From 3d168c196ece3706f47e1515520c2f0d77635ec3 Mon Sep 17 00:00:00 2001
From: "rong.liu" <liurong@huorantech.cn>
Date: Thu, 23 Feb 2023 15:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=8F=96=E7=9C=9F?=
 =?UTF-8?q?=E5=AE=9E=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huoran/iasf/mapper/xml/SysColumnMapper.xml   | 16 ++++++++--------
 .../huoran/iasf/mapper/xml/SysContentMapper.xml  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
index bed1a19..25ae6b0 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
@@ -33,8 +33,8 @@
     <select id="filter" resultType="com.huoran.iasf.entity.SysColumn">
         SELECT
         *,
-        ( SELECT u.username FROM sys_user u WHERE u.id = s.founder_id ) AS creteUser,
-        ( SELECT u.username FROM sys_user u WHERE u.id = s.editor_id ) AS editorUser,
+        ( SELECT u.real_name FROM sys_user u WHERE u.id = s.founder_id ) AS creteUser,
+        ( SELECT u.real_name FROM sys_user u WHERE u.id = s.editor_id ) AS editorUser,
         ( SELECT t.template_type FROM sys_template t WHERE t.id = s.template_id ) AS templateName,
         ( SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.list_style_id ) AS listStyle,
         ( SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.detail_style_id ) AS detailStyle,
@@ -61,8 +61,8 @@
 
 
     <select id="longPageColumnList" resultType="com.huoran.iasf.vo.resp.PageContentRespVO">
-        SELECT (SELECT u.username FROM sys_user u WHERE u.id = c.founder_id) AS founderName,
-               (SELECT u.username FROM sys_user u WHERE u.id = c.editor_id)  AS editorName,
+        SELECT (SELECT u.real_name FROM sys_user u WHERE u.id = c.founder_id) AS founderName,
+               (SELECT u.real_name FROM sys_user u WHERE u.id = c.editor_id)  AS editorName,
                c.*
         FROM sys_column c
         WHERE deleted = 1
@@ -93,8 +93,8 @@
     <select id="filterMenuVisible" resultType="com.huoran.iasf.entity.SysColumn">
         SELECT
         *,
-        ( SELECT u.username FROM sys_user u WHERE u.id = s.founder_id ) AS creteUser,
-        ( SELECT u.username FROM sys_user u WHERE u.id = s.editor_id ) AS editorUser,
+        ( SELECT u.real_name FROM sys_user u WHERE u.id = s.founder_id ) AS creteUser,
+        ( SELECT u.real_name FROM sys_user u WHERE u.id = s.editor_id ) AS editorUser,
         ( SELECT t.template_type FROM sys_template t WHERE t.id = s.template_id ) AS templateName,
         ( SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.list_style_id ) AS listStyle,
         ( SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.detail_style_id ) AS detailStyle,
@@ -148,8 +148,8 @@
     </select>-->
     <select id="getsTheSubColumn" resultType="com.huoran.iasf.entity.SysColumn">
         SELECT *,
-        (SELECT u.username FROM sys_user u WHERE u.id = s.founder_id) AS creteUser,
-        (SELECT u.username FROM sys_user u WHERE u.id = s.editor_id) AS editorUser,
+        (SELECT u.real_name FROM sys_user u WHERE u.id = s.founder_id) AS creteUser,
+        (SELECT u.real_name FROM sys_user u WHERE u.id = s.editor_id) AS editorUser,
         (SELECT t.template_type FROM sys_template t WHERE t.id = s.template_id) AS templateName,
         (SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.list_style_id) AS listStyle,
         (SELECT sty.style FROM sys_template_style sty WHERE sty.id = s.detail_style_id) AS detailStyle,
diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
index 4555e50..c4a00db 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
@@ -4,8 +4,8 @@
     <select id="articlePaginationList" resultType="com.huoran.iasf.vo.resp.PageContentRespVO">
         SELECT c.*,
         (SELECT sys_column.column_name FROM sys_column WHERE sys_column.id = c.column_id) AS columnName,
-        (SELECT u.username FROM sys_user u WHERE u.id = c.founder_id) AS founderName,
-        (SELECT u.username FROM sys_user u WHERE u.id = c.editor_id) AS editorName,
+        (SELECT u.real_name FROM sys_user u WHERE u.id = c.founder_id) AS founderName,
+        (SELECT u.real_name FROM sys_user u WHERE u.id = c.editor_id) AS editorName,
         (SELECT type_id from sys_column WHERE sys_column.id = c.column_id) as typeId
         FROM sys_content c
         WHERE c.deleted = 1 and site_id = #{req.siteId}
@@ -22,13 +22,13 @@
             and title LIKE CONCAT('%',#{req.title},'%')
         </if>
         <if test="req.founder != null and req.founder != ''">
-            AND ( SELECT u.username FROM sys_user u WHERE u.id = c.founder_id ) LIKE
+            AND ( SELECT u.real_name FROM sys_user u WHERE u.id = c.founder_id ) LIKE
             CONCAT('%',#{req.founder},'%')
         </if>
 
 
         <if test="req.editor != null and req.editor != ''">
-            AND ( SELECT u.username FROM sys_user u WHERE u.id = c.editor_id ) LIKE CONCAT('%',#{req.editor},'%')
+            AND ( SELECT u.real_name FROM sys_user u WHERE u.id = c.editor_id ) LIKE CONCAT('%',#{req.editor},'%')
         </if>
 
         <if test="req.column != null and req.column != ''">