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

liyong

9 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

@@ -13,7 +13,7 @@
            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 = 100)
            T1.dept_id IN (select dept_id from sys_dept where parent_id != 0)
            <if test="userDeptVo.userId != null">
                AND T1.user_id = #{userDeptVo.userId}
            </if>