|
@@ -124,15 +124,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
ANY_VALUE(czrk.user_name) userName,
|
|
ANY_VALUE(czrk.user_name) userName,
|
|
ANY_VALUE(czrk.phone_num) phoneNum,
|
|
ANY_VALUE(czrk.phone_num) phoneNum,
|
|
ANY_VALUE(czrk.id_card) idCard,
|
|
ANY_VALUE(czrk.id_card) idCard,
|
|
- ANY_VALUE(czrk.gender),
|
|
|
|
- ANY_VALUE(czrk.province),
|
|
|
|
- ANY_VALUE(czrk.is_rl),
|
|
|
|
- ANY_VALUE(czrk.city),
|
|
|
|
- ANY_VALUE(czrk.region),
|
|
|
|
|
|
+ ANY_VALUE(czrk.gender) gender,
|
|
|
|
+ ANY_VALUE(czrk.province) province,
|
|
|
|
+ ANY_VALUE(czrk.is_rl) isRl,
|
|
|
|
+ ANY_VALUE(czrk.city) city,
|
|
|
|
+ ANY_VALUE(czrk.region) region,
|
|
ANY_VALUE(czrk.house_type) houseType,
|
|
ANY_VALUE(czrk.house_type) houseType,
|
|
ANY_VALUE(czrk.update_by) updateBy,
|
|
ANY_VALUE(czrk.update_by) updateBy,
|
|
- ANY_VALUE(czrk. CODE),
|
|
|
|
- ANY_VALUE(czrk.rlr),
|
|
|
|
|
|
+ ANY_VALUE(czrk. CODE) CODE,
|
|
|
|
+ ANY_VALUE(czrk.rlr) rlr,
|
|
ANY_VALUE(czrk.update_time) updateTime,
|
|
ANY_VALUE(czrk.update_time) updateTime,
|
|
ANY_VALUE(czrk.delete_reason) deleteReason,
|
|
ANY_VALUE(czrk.delete_reason) deleteReason,
|
|
ANY_VALUE(czrk.now_in) nowIn,
|
|
ANY_VALUE(czrk.now_in) nowIn,
|
|
@@ -145,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
from czrk
|
|
from czrk
|
|
left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
|
|
left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
|
|
<where>
|
|
<where>
|
|
|
|
+ jzdz.status = 'Y'
|
|
<!-- 已认领 -->
|
|
<!-- 已认领 -->
|
|
<if test="isRl != null and isRl != ''">and czrk.is_rl = #{isRl}</if>
|
|
<if test="isRl != null and isRl != ''">and czrk.is_rl = #{isRl}</if>
|
|
|
|
|
|
@@ -578,7 +579,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
from czrk
|
|
from czrk
|
|
left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
|
|
left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
|
|
<where>
|
|
<where>
|
|
- czrk.is_del = 'N'
|
|
|
|
|
|
+ czrk.is_del = 'N' and jzdz.status = 'Y'
|
|
<if test="userName != null and userName != ''">
|
|
<if test="userName != null and userName != ''">
|
|
and (czrk.user_name like concat('%', #{userName}, '%') or czrk.id_card like concat('%', #{userName}, '%'))
|
|
and (czrk.user_name like concat('%', #{userName}, '%') or czrk.id_card like concat('%', #{userName}, '%'))
|
|
</if>
|
|
</if>
|