From 6362e43078e0d5492e22e4bfbc378143afa6c8f3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 21 Jan 2022 16:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=97=E8=B5=8B=E8=83=BD=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=E8=AE=AE=E9=A2=98=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA=E5=A7=93=E5=90=8D=EF=BC=8C=E5=9B=A0=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0userWechat=E8=A1=A8=20=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E6=94=B9=E5=8E=BBuserbaseinfo=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/UserResiInfoDao.java   |  1 +
 .../service/impl/UserResiInfoServiceImpl.java |  4 ++-
 .../main/resources/mapper/UserResiInfoDao.xml | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
index 73044f21c4..1fddb41280 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
@@ -78,6 +78,7 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @date 2020/5/11 11:18
 	 */
 	IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO);
+	IssueInitiatorResultDTO issueInitiatorByBaseInfo(IssueInitiatorFormDTO formDTO);
 
 	/**
 	 * @param userId
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 017a0469df..ee80c0809d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -387,7 +387,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 */
 	@Override
 	public IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
-		return userResiInfoDao.selectIssueInitiator(formDTO);
+		//return userResiInfoDao.selectIssueInitiator(formDTO);
+		//市北赋能平台查询议题创建人姓名，因没有上传userWechat表 所以改去userbaseinfo表查询
+		return userResiInfoDao.issueInitiatorByBaseInfo(formDTO);
 	}
 
 	/**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index 102f9611ac..df1d830567 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -168,6 +168,34 @@
             AND uw.del_flag = 0
     </select>
 
+    <select id="issueInitiatorByBaseInfo" parameterType="com.epmet.dto.form.IssueInitiatorFormDTO" resultType="com.epmet.dto.result.IssueInitiatorResultDTO">
+        SELECT
+            CONCAT(
+                uri.street,
+                '-',
+                uri.surname,
+                CASE
+            WHEN uri.GENDER = '1' THEN
+                '先生'
+            WHEN uri.GENDER = '2' THEN
+                '女士'
+            ELSE
+                '先生/女士'
+            END
+            ) AS issueInitiator,
+            CONCAT(
+                uri.street,
+                '-',
+                uri.surname,
+                uri.NAME
+            ) AS realUserName
+        FROM
+            user_base_info uri
+        WHERE
+            uri.user_id = #{userId}
+            AND uri.del_flag = 0
+    </select>
+
     <!--  根据要用户id,查询用户注册的信息  -->
     <select id="selectByUserId" resultType="com.epmet.dto.UserResiInfoDTO">
         SELECT