分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

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

@@ -83,11 +83,6 @@
        from user u left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
    <select id="seldepLimsId" resultType="java.lang.String">
        select name
        from department_lims
        where id = #{depLimsId}
    </select>
    <select id="getLaboratoryPersonList" resultType="java.util.Map">
        select
        u.id,
@@ -107,4 +102,28 @@
            and dl.name = #{laboratory}
        </if>
    </select>
    <select id="seldepLimsId" resultType="java.lang.String">
        select name
        from department_lims
        where id = #{depLimsId}
    </select>
    <select id="getPersonList" 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 = 1
        and u.is_custom = 0
        <if test="laboratory!='' and laboratory!=null">
            and (dl.name = #{laboratory} or dl.name='检测办')
        </if>
    </select>
</mapper>