Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -47,8 +47,8 @@
    <select id="selectSysUserDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept"
            resultMap="SysUserDeptResult">
        <include refid="selectSysUserDeptVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            and orgid=#{orgid}
            <if test="userId != null ">
                and user_id = #{userId}
@@ -74,7 +74,6 @@
            <if test="campusid != null ">
                and campusid = #{campusid}
            </if>
        </where>
    </select>

    <select id="selectSysUserDeptById" parameterType="Long"