|
|
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="directedStudy" column="directed_study" />
|
|
|
<result property="evalCounts" column="eval_counts" />
|
|
|
<result property="cardId" column="card_id" />
|
|
|
+ <result property="bindStatus" column="bind_status" />
|
|
|
<result property="status" column="status" />
|
|
|
<result property="delFlag" column="del_flag" />
|
|
|
<result property="loginIp" column="login_ip" />
|
|
|
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<sql id="selectUserVo">
|
|
|
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
|
|
|
- u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.exam_major,u.directed_study,u.eval_counts,u.card_id,u.account_type,
|
|
|
+ u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.exam_major,u.directed_study,u.eval_counts,u.card_id,u.bind_status,u.account_type,
|
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.user_type, u.user_type_id
|
|
|
from sys_user u
|
|
|
@@ -74,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u.user_type, u.user_type_id, u.account_type
|
|
|
- ,u.card_id,u.end_year,u.location,u.invite_code,u.exam_type from sys_user u
|
|
|
+ ,u.card_id,u.bind_status,u.end_year,u.location,u.invite_code,u.exam_type from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join dz_cards c on u.card_id = c.card_id
|
|
|
left join dz_agent a on CAST(u.invite_code AS UNSIGNED) = a.agent_id
|
|
|
@@ -145,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectCardUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u.user_type, u.user_type_id, u.account_type
|
|
|
- ,u.card_id,u.end_year,u.location,u.invite_code,u.exam_type from sys_user u
|
|
|
+ ,u.card_id,u.bind_status,u.end_year,u.location,u.invite_code,u.exam_type from sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
left join dz_cards c on u.card_id = c.card_id
|
|
|
left join dz_agent a on CAST(u.invite_code AS UNSIGNED) = a.agent_id
|
|
|
@@ -196,6 +197,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="inviteCode != null and inviteCode != ''">
|
|
|
AND u.invite_code like concat('%', #{inviteCode}, '%')
|
|
|
</if>
|
|
|
+ <if test="bindStatus != null">
|
|
|
+ AND u.bind_status = #{bindStatus}
|
|
|
+ </if>
|
|
|
<if test="usercardType != null and usercardType != ''">
|
|
|
<choose>
|
|
|
<when test="usercardType == '99' or usercardType == 99">
|
|
|
@@ -338,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="examMajor != null and examMajor != ''">exam_major,</if>
|
|
|
<if test="directedStudy != null and directedStudy != ''">directed_study,</if>
|
|
|
<if test="cardId != null and cardId != ''">card_id,</if>
|
|
|
+ <if test="bindStatus != null">bind_status,</if>
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
|
<if test="userType != null and userType != ''">user_type,</if>
|
|
|
@@ -367,6 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="examMajor != null and examMajor != ''">#{examMajor},</if>
|
|
|
<if test="directedStudy != null and directedStudy != ''">#{directedStudy},</if>
|
|
|
<if test="cardId != null and cardId != ''">#{cardId},</if>
|
|
|
+ <if test="bindStatus != null">#{bindStatus},</if>
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
|
<if test="userType != null">#{userType},</if>
|
|
|
@@ -399,6 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="directedStudy != null and directedStudy != ''">directed_study = #{directedStudy},</if>
|
|
|
<if test="evalCounts != null and evalCounts != ''">eval_counts = #{evalCounts},</if>
|
|
|
<if test="cardId != null and cardId != ''">card_id = #{cardId},</if>
|
|
|
+ <if test="bindStatus != null">bind_status = #{bindStatus},</if>
|
|
|
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
|
|
|
<if test="loginDate != null">login_date = #{loginDate},</if>
|
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
mingfu