From e452f5a90442a7978864e9a2e029ca484882840b Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 5 Jun 2021 15:38:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/custom/SysServicesTopicMapper.xml  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
index bfbd1d630..11075cdef 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
@@ -22,11 +22,22 @@
     <!--    根据userId和角色查询问题列表-->
     <select id="selectSysServicesTopicByUserIdAndRole" parameterType="SysServicesTopic"
             resultMap="SysServicesTopicResult">
-        SELECT * FROM (
-        SELECT topic_id, id, `read`, create_time, update_time, 'customer' AS role FROM sys_services_topic_status WHERE role = #{role} AND uid = #{uid}
-        ) AS status
-        LEFT JOIN sys_services_topic USING(topic_id) WHERE del_flag = 0
-        ORDER BY `read` ASC, update_time DESC
+        <choose>
+            <when test="role == 'admin' or role == 'manager'">
+                select topic_id, topic_type, content, uid, create_time, img, 1 as `read`, '0' as id, 'customer' as role
+                from sys_services_topic where del_flag = 0 order by create_time desc
+            </when>
+            <otherwise>
+                SELECT * FROM (
+                SELECT topic_id, id, `read`, create_time, update_time, 'customer' AS role FROM sys_services_topic_status
+                WHERE role = #{role} AND uid = #{uid}
+                ) AS status
+                LEFT JOIN sys_services_topic USING(topic_id) WHERE del_flag = 0
+                ORDER BY `read` ASC, update_time DESC
+            </otherwise>
+        </choose>
+
+
     </select>
 
     <!--    查询主题-->
@@ -56,7 +67,7 @@
         <association property="fromName" column="{uid=from_uid,role=from_role}" select="selectUserInfo"/>
         <association property="fromAvatar" column="{uid=from_uid,role=from_role}" select="selectUserAvatar"/>
         <association property="toName" column="{uid=to_uid,role=to_role}" select="selectUserInfo"/>
-<!--        <association property="toAvatar" column="{uid=to_uid,role=to_role}" select="selectUserAvatar"/>-->
+        <!--        <association property="toAvatar" column="{uid=to_uid,role=to_role}" select="selectUserAvatar"/>-->
         <association property="replys" column="id"
                      select="selectServicesTopicCommentReplyByCommentId"/>
     </resultMap>
@@ -76,7 +87,7 @@
         <association property="fromName" column="{uid=from_uid,role=from_role}" select="selectUserInfo"/>
         <association property="fromAvatar" column="{uid=from_uid,role=from_role}" select="selectUserAvatar"/>
         <association property="toName" column="{uid=to_uid,role=to_role}" select="selectUserInfo"/>
-<!--        <association property="toAvatar" column="{uid=to_uid,role=to_role}" select="selectUserAvatar"/>-->
+        <!--        <association property="toAvatar" column="{uid=to_uid,role=to_role}" select="selectUserAvatar"/>-->
     </resultMap>
 
 
@@ -115,7 +126,8 @@
                 select avatar_url from sys_wx_user_info where cus_id = #{uid}
             </when>
             <otherwise>
-                select IF(avatar != '', CONCAT("https://api.stdiet.top/prod-api", avatar), '') as avatar from sys_user where user_id = #{uid}
+                select IF(avatar != '', CONCAT("https://api.stdiet.top/prod-api", avatar), '') as avatar from sys_user
+                where user_id = #{uid}
             </otherwise>
         </choose>
     </select>

From f6d1151db22159f5aa91e97e285971e0b7f801a8 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 5 Jun 2021 15:42:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/custom/SysServicesTopicMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
index 11075cdef..4afeb6edb 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysServicesTopicMapper.xml
@@ -23,7 +23,7 @@
     <select id="selectSysServicesTopicByUserIdAndRole" parameterType="SysServicesTopic"
             resultMap="SysServicesTopicResult">
         <choose>
-            <when test="role == 'admin' or role == 'manager'">
+            <when test="role == 'admin' or role == 'manager' or role == 'admin-dev'">
                 select topic_id, topic_type, content, uid, create_time, img, 1 as `read`, '0' as id, 'customer' as role
                 from sys_services_topic where del_flag = 0 order by create_time desc
             </when>