Merge branch 'master' into master-任务组

陈昶聿

8 天以前 dbdd6dd8934575741a4816cf3af3493b014d3305

 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>