From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
index 4dade62..8e16188 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
@@ -278,7 +278,16 @@
 		where wx_union_id=#{unionId} AND state = 0
 		LIMIT 1
 	</select>
-
+	
+	
+	<select id="getEffectiveUserInfoByWXOpenId" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_user
+		where wx_open_id=#{wxOpenId} AND state = 0
+		LIMIT 1
+	</select>
+	
 	<select id="getMaxUid" resultType="java.lang.Long">select max(id) from
 		yeshi_ec_user
 	</select>

--
Gitblit v1.8.0