fix(gd): 修复线索事件查询中的SQL语法错误

linwei

15 hours ago 08ddfad4530a014094c06fe68b8c2d9a0753403a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml

@@ -18,10 +18,11 @@
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="device_create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
    <sql id="deviceFields">
        b.device_name,
        b.device_type,
        b.device_att,
@@ -31,10 +32,16 @@
        b.manufacturer,
        b.source,
        b.purpose,
        a.*
        b.charger,
        b.create_time as device_create_time
    </sql>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)
        left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
        <where>
            a.is_deleted = 0
            <if test="id != null and id != ''">
@@ -46,19 +53,10 @@

    <select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
        select
        b.device_name,
        b.device_type,
        b.device_att,
        b.device_model,
        b.belong_dept,
        b.device_specification,
        b.manufacturer,
        b.source,
        b.purpose,
        a.*
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)
        left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
        <where>
            a.is_deleted = 0
            <if test="param2.deviceId != null and param2.deviceId != ''">
@@ -73,6 +71,12 @@
            <if test="param2.belongDept != null and param2.belongDept != ''">
                and belong_dept = #{param2.belongDept}
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and a.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>