分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

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

@@ -61,7 +61,46 @@
        where u.id = #{userId}
    </select>
    <select id="selectUserInfo" resultType="com.ruoyi.common.core.vo.SysUserVO">
        select * from user
        select u.id as user_id,
               u.dept_id,
               u.name as nick_name,
               u.account as user_name,
               u.name_en,
               u.email,
               u.phone as phone_number,
               u.sex,
               u.picture_url,
               u.signature_url,
               u.company,
               c.company as company_name,
               c.code,
               u.password,
               u.status,
               u.del_flag,
               u.login_ip,
               u.login_date,
               u.is_custom
        from user u left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
    <select id="getLaboratoryPersonList" resultType="java.util.Map">
        select
        u.id,
        u.name,
        dl.name as depName
        from
        user u
        left join
        department_lims dl
        on
        FIND_IN_SET(dl.id,u.depart_lims_id)
        where
        dl.name in('通信产品实验室','电力产品实验室')
        and u.status = 0
        and u.is_custom = 0
        <if test="laboratory!='' and laboratory!=null">
            and dl.name = #{laboratory}
        </if>
    </select>
    <select id="seldepLimsId" resultType="java.lang.String">
        select name