Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-15 5a697e6fafbe3855336ca5fd7e1785de12840d16

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

@@ -120,7 +120,7 @@
        FIND_IN_SET(dl.id,u.depart_lims_id)
        where
        dl.name in('通信产品实验室','电力产品实验室','检测办')
        and u.status = 1
        and u.state = 1
        and u.is_custom = 0
        <if test="laboratory!='' and laboratory!=null">
            and (dl.name = #{laboratory} or dl.name='检测办')