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

maven

3 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

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

@@ -19,7 +19,7 @@
            </if>
            <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
                AND T1.user_id IN (
                SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                )
            </if>
        </where>