Merge branch 'main' of ssh://124.243.245.42:2222/zkr/shz-backend
This commit is contained in:
@@ -34,10 +34,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="lcUserid" column="lc_userid" />
|
||||
<result property="email" column="email" />
|
||||
<result property="resumeStatus" column="resume_status" />
|
||||
<result property="nation" column="nation" />
|
||||
<result property="openid" column="openid" />
|
||||
<result property="unionid" column="unionid" />
|
||||
<result property="address" column="address" />
|
||||
<result property="domicileAddress" column="domicile_address" />
|
||||
<result property="userType" column="user_type" />
|
||||
<result property="experience" column="experience" />
|
||||
<result property="ytjPassword" column="ytj_password" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAppUserVo">
|
||||
select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,lc_userid,email,resume_status from app_user
|
||||
select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,lc_userid,email,resume_status,nation,openid,unionid,address,domicile_address,user_type,experience,ytj_password from app_user
|
||||
</sql>
|
||||
|
||||
<select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
|
||||
@@ -53,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="avatar != null and avatar != ''"> and avatar = #{avatar}</if>
|
||||
<if test="salaryMin != null and salaryMin != ''"> and salary_min = #{salaryMin}</if>
|
||||
<if test="salaryMax != null and salaryMax != ''"> and salary_max = #{salaryMax}</if>
|
||||
<if test="nation != null and nation != ''"> and nation = #{nation}</if>
|
||||
<if test="area != null and area != ''"> and area = #{area}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="loginIp != null and loginIp != ''"> and login_ip = #{loginIp}</if>
|
||||
@@ -136,6 +145,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where user_id = #{userId}
|
||||
</update>
|
||||
|
||||
<update id="updateSysUserPassword">
|
||||
update sys_user
|
||||
set password = #{password},
|
||||
update_time = sysdate()
|
||||
where user_id = #{userId}
|
||||
</update>
|
||||
|
||||
<select id="selectUserApplyList" parameterType="AppUser" resultType="com.ruoyi.common.core.domain.entity.AppUserShow">
|
||||
select a.user_id , a.name , a.age , a.sex , get_birth_date_from_id_card ( a.id_card ) as birth_date ,
|
||||
a.education , a.political_affiliation , a.phone , a.avatar , c.min_salary salaryMin ,c.max_salary salaryMax,a.area ,a.id_card ,
|
||||
|
||||
@@ -90,13 +90,13 @@
|
||||
and htc.source_type = #{sourceType}
|
||||
</if>
|
||||
<if test="collectTags != null and collectTags != ''">
|
||||
and htc.collect_tags like concat('%',#{collectTags},'%')
|
||||
and htc.collect_tags like '%' || #{collectTags} || '%'
|
||||
</if>
|
||||
<if test="name != null and name != ''">
|
||||
and au.name like concat('%',#{name},'%')
|
||||
and au.name like '%' || #{name} || '%'
|
||||
</if>
|
||||
<if test="phone != null and phone != ''">
|
||||
and au.phone like concat('%',#{phone},'%')
|
||||
and au.phone like '%' || #{phone} || '%'
|
||||
</if>
|
||||
<if test="education != null and education != ''">
|
||||
and au.education = #{education}
|
||||
|
||||
Reference in New Issue
Block a user