Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 0c2b1e149c6c0d9d9ec78bf4f871b3cea2cbfadc

 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml

@@ -181,4 +181,21 @@
             AND deleted = 0
    </select>

    <select id="select" resultType="com.ycl.platform.domain.entity.YwPoint">
        SELECT
               *
        FROM
             t_yw_point
        <where>
            <if test="keyword != null and keyword != ''">
                AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%'))
            </if>
            <if test="unitId != null">
                AND unit_id = #{unitId}
            </if>
            AND deleted = 0
        </where>

    </select>

</mapper>