From 0e45a343cbb2c82ab405e6b47e3d8ab4a668196e Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 12 Aug 2020 17:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4=E4=B8=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E6=B3=A8=E5=86=8C=E8=BF=87?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=9A=84=E9=99=8C=E7=94=9F=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserWechatDao.xml                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 5120737f88..98a5c58075 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -91,6 +91,7 @@
     </select>
 
     <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
+    <!-- 不显示没有认证过志愿者的陌生人，以Surname判断是否注册志愿者 -->
     <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
         SELECT
         wechat.USER_ID,
@@ -104,6 +105,7 @@
         WHERE
             wechat.DEL_FLAG = '0'
             AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME <![CDATA[ <> ]]> '')
+            AND (base.SURNAME IS NOT NULL OR base.SURNAME <![CDATA[ <> ]]> '')
             <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
                 wechat.USER_ID = #{item}
             </foreach>