Merge branch 'master' into master-任务组

陈昶聿

昨天 fcb98e4558897945a316d04555923355b8e60605

 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>
@@ -237,6 +237,24 @@
        where user_id =#{userId} and dept_code=#{deptCode}
    </update>

    <update id="deleteSysUserDeptByUserId" parameterType="String">
        update sys_user_dept
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1,
            update_time = sysdate()
        </trim>
        where del_flag = 0
        <if test="userId != null">
            and user_id =#{userId}
        </if>
        <if test="orgid != null ">
            and orgid = #{orgid}
        </if>
        <if test="deptType != null ">
            and dept_type = #{deptType}
        </if>
    </update>

    <update id="updateSysUserDeptForSync" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept">
        update sys_user_dept
        <trim prefix="SET" suffixOverrides=",">