|
|
@@ -107,7 +107,7 @@
|
|
|
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
|
u.major_id, u.grade, u.tutor_user_id, u.position, p.post_name as positionName,
|
|
|
u.nature,(select sc.class_name from sys_class sc where sc.id = u.grade) gradeName,
|
|
|
- u.card_num,u.wechat_id,u.nationality,u.addr,u.work_status,
|
|
|
+ u.card_num,u.card_num_simple,u.wechat_id,u.nationality,u.addr,u.work_status,
|
|
|
u.date_birth,d.dept_name, d.leader,u.department,
|
|
|
u.education, u.user_type,sm.`major_name` major,
|
|
|
ut.nick_name tutorUserName,u.is_check,date_format(u.create_time, '%Y-%m-%d') createTimeStr
|
|
|
@@ -133,6 +133,14 @@
|
|
|
<if test="cardNum != null and cardNum != ''">
|
|
|
AND u.card_num = #{cardNum}
|
|
|
</if>
|
|
|
+ <if test="cardNumSimple != null and cardNumSimple != ''">
|
|
|
+ <if test="cardNumSimple == 1">
|
|
|
+ AND u.card_num_simple is not null
|
|
|
+ </if>
|
|
|
+ <if test="cardNumSimple == 0">
|
|
|
+ AND u.card_num_simple is null
|
|
|
+ </if>
|
|
|
+ </if>
|
|
|
<if test="userType != null and userType != ''">
|
|
|
AND u.user_type = #{userType}
|
|
|
</if>
|
|
|
@@ -660,6 +668,15 @@
|
|
|
</foreach>
|
|
|
and length(phonenumber)=11
|
|
|
</select>
|
|
|
+
|
|
|
+ <select id="queryCardNumByIds" resultType="com.zd.model.entity.SysUser">
|
|
|
+ select * from sys_user
|
|
|
+ where card_num_simple in
|
|
|
+ <foreach collection="array" item="cardNums" open="(" separator="," close=")">
|
|
|
+ #{cardNums}
|
|
|
+ </foreach>
|
|
|
+ </select>
|
|
|
+
|
|
|
<select id="queryCountByDeptIds" resultType="com.zd.model.entity.TotalByID">
|
|
|
|
|
|
select dept_id as id, count(dept_id ) as total from sys_user
|