|
|
@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
fs_user.avatar,
|
|
|
fs_user.phone,
|
|
|
fs_user.status,
|
|
|
- COALESCE(ucu.update_time, ucu.create_time) createTime,
|
|
|
+ ucu.update_time createTime,
|
|
|
fs_user.remark,
|
|
|
ucu.company_user_id,
|
|
|
ucu.company_id,
|
|
|
@@ -370,10 +370,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND ucu.company_user_id = #{companyUserId}
|
|
|
</if>
|
|
|
<if test="registerStartTime != null and registerStartTime !='' ">
|
|
|
- AND fs_user.create_time >= #{registerStartTime}
|
|
|
+ AND ucu.update_time >= #{registerStartTime}
|
|
|
</if>
|
|
|
<if test="registerEndTime != null and registerEndTime !='' ">
|
|
|
- AND fs_user.create_time <= #{registerEndTime}
|
|
|
+ <![CDATA[
|
|
|
+ AND ucu.update_time < date_add(#{registerEndTime}, interval 1 day)
|
|
|
+ ]]>
|
|
|
</if>
|
|
|
<if test="companyUserIds != null and companyUserIds.size > 0">
|
|
|
AND ucu.company_user_id in
|