Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -301,15 +301,14 @@

    <select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        <where>
            u.del_flag = '0'
        where 1=1
            AND u.del_flag = '0'
            <if test="userName != null and userName != ''">
                AND u.user_name = #{userName}
            </if>
            <if test="deptId != null and deptId != ''">
                AND u.dept_id = #{deptId}
            </if>
        </where>
    </select>

    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">