Merge branch 'master' into master-任务组

陈昶聿

4 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

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

@@ -71,7 +71,7 @@
            <if test="deptCode != null ">
                and dept_code = #{deptCode}
            </if>
            <if test="campusid != null ">
            <if test="campusid != null and campusid != ''">
                and campusid = #{campusid}
            </if>
    </select>