From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 2213399..9ced418
--- a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml
@@ -31,10 +31,12 @@
             uqa.evaluation_score evaluationScore,
             uqa.user_qa_id userQaId,
             uqa.person_id personId,
+            uu.name personName,
             uqa.state
         FROM
             question_answer t
             LEFT JOIN user_question_answer uqa ON t.qa_id = uqa.qa_id AND t.obj_type = uqa.obj_type AND t.obj_id = uqa.obj_id AND uqa.status_cd = '0'
+            left join u_user uu on uqa.person_id = uu.user_id and uu.status_cd = '0'
             LEFT JOIN t_dict td ON td.status_cd = t.qa_type AND td.table_name = 'question_answer' AND td.table_columns = 'qa_type'
         WHERE
         <if test="personId !=null and personId != ''">

--
Gitblit v1.8.0