From 143160118ab3937ae9e340f61aafa764756856c8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 17 十月 2019 14:58:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml | 7 ++++--- 1 files changed, 4 insertions(+), 3 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 7354a39..f1b984e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml @@ -80,6 +80,7 @@ jdbcType="VARCHAR" /> <result column="uie_gold_coin" property="goldCoin" jdbcType="INTEGER" /> + <result column="uie_mark" property="mark" jdbcType="VARCHAR" /> </resultMap> <resultMap id="ChartMap" type="com.yeshi.fanli.dto.ChartTDO"> @@ -700,11 +701,11 @@ where u.state=0 </select> - <select id="getAutoExtractUserIds" resultType="java.lang.Long"> - SELECT u.`id` FROM `yeshi_ec_user_info_extra` t + <select id="getAutoExtractUserIds" resultMap="BaseResultMap"> + SELECT u.* FROM `yeshi_ec_user_info_extra` t LEFT JOIN `yeshi_ec_user` u ON u.`id` = t.`uie_uid` WHERE t.`uie_auto_extract` = 1 AND u.`state` = 0 AND u.`my_hongBao` <![CDATA[>=]]> #{money} - AND u.`wx_open_id` IS NOT NULL + AND u.`wx_open_id` IS NOT NULL AND LENGTH(TRIM(u.`wx_open_id`)) <![CDATA[>]]> 0 LIMIT #{start},#{count} </select> -- Gitblit v1.8.0