Merge remote-tracking branch 'origin/master'

Administrator

2022-05-18 644ed3e30bbee9a417dfbe649f2a72df25a7efb1

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml

@@ -35,6 +35,8 @@
        on
        bd.id = bu.dept_id
        where 1=1
        and bu.status =1
        and bu.is_deleted = 0
        <if test="dispatcher.dispatcherUnitId!=null">
            and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
        </if>