Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

2 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

 src/main/resources/mapper/system/SysUserDeptMapper.xml

@@ -3,8 +3,25 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
    
    <select id="selectUserDeptList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
    <select id="setSchemeApplicableStaffUserInfo" resultType="java.util.Map">
        SELECT
        T1.id as id,
        T1.staff_no as staffNo,
        T1.staff_name as staffName,
        T2.dept_id as deptId,
        T2.dept_name as deptName,
        T1.staff_state as staffState
        FROM
        staff_on_job T1
        LEFT JOIN sys_dept T2 ON T1.sys_dept_id = T2.dept_id
        <where>
            T1.sys_dept_id in<foreach collection="ids" item="id" separator="," close=")" open="(">#{id}</foreach>
        </where>
        GROUP BY
        T1.id
    </select>

    <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
        SELECT
            T1.user_id,
            T1.dept_id,
@@ -13,12 +30,13 @@
            sys_user_dept T1
        LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
        <where>
            T1.dept_id IN (select dept_id from sys_dept where parent_id != 0)
            <if test="userDeptVo.userId != null">
                T1.user_id = #{userDeptVo.userId}
                AND T1.user_id = #{userDeptVo.userId}
            </if>
            <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
                T1.user_id IN (
                SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                AND T1.user_id IN (
                SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                )
            </if>
        </where>