Merge branch 'dev' into dev_zj

zss

2025-02-20 5101e344b4ac9de94d0f18d8a501158be49221ff

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

@@ -47,4 +47,17 @@
                 left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
        where find_in_set(u.id, #{participant})
    </select>

    <!-- 获取当前登录用户信息 -->
    <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
        select u.id,
               c.company,
               u.name,
               c.code,
               u.phone,
               c.id departId
        from user u
                 left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
</mapper>