Merge branch 'dev'

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

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);
 	}
 
 	/**

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