保安筛选逻辑调整

zengh

2021-05-07 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -55,6 +55,7 @@
        <result column="work_status" property="work_status"/>
        <result column="jd" property="jd"/>
        <result column="wd" property="wd"/>
        <result column="dept_name" property="deptName"/>
    </resultMap>

    <select id="selectUserPage" resultMap="userResultMap">
@@ -100,6 +101,9 @@
        <if test="user.account!=null and user.account != ''">
            and s.account = #{user.account}
        </if>
        <if test="user.id!=null and user.id != ''">
            and s.id = #{user.id}
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and s.real_name = #{user.realName}
        </if>
@@ -136,14 +140,25 @@
    </select>

    <!--查询处警人员列表-->
    <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
        SELECT bu.*,p.jd,p.wd FROM blade_user bu
            LEFT JOIN
    <select id="selectSecurityUserPageList" resultMap="userResultMaps">
        SELECT bu.id,bu.name,bu.code,bu.real_name,bu.account,
            bu.email,bu.phone,bu.birthday,bu.create_time,
            bu.sex,ifnull(bu.online_status,0) online_status,
        bd.dept_name,p.jd,p.wd FROM blade_user bu
        LEFT JOIN
        jfpt.sys_position p
            on
        on
        p.snumber=bu.code
            where
        role_id = #{user.roleId}
        left join
        blade_dept bd
        on
        bd.id=bu.dept_id
        left join
        blade_role br
        on
        bu.role_id=br.id
        where
        br.role_alias ='处警员'
        <if test="user.realName!=null and user.realName !=''">
            <bind name="realName" value="'%'+user.realName+'%'"/>
            and bu.real_name like #{realName}