Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml

@@ -298,4 +298,15 @@
    <select id="getWellById" resultMap="ArdAlarmpointsWellOnlyResult">
        select aaw.* from ard_alarmpoints_well aaw where aaw.id = #{id}
    </select>


    <select id="conditionList" parameterType="List"
            resultType="com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellDeptVo">
        Select * from ard_alarmpoints_well well
        where WHERE well.well_id = #{wellId}
        and well.dept_id in
        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </select>
</mapper>