Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

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

@@ -12,6 +12,10 @@
        <result column="device_specification" property="deviceSpecification"/>
        <result column="manufacturer" property="manufacturer"/>
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="belong_dept" property="belongDept"/>
        <result column="charger" property="charger"/>
        <result column="contact_phone" property="contactPhone"/>
        <result column="remark" property="remark"/>
        <result column="battery_pct" property="batteryPct"/>
        <result column="azimuth" property="azimuth"/>
@@ -26,7 +30,7 @@
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
<!--        <result column="is_deleted" property="isDeleted"/>-->
    </resultMap>


@@ -38,7 +42,7 @@
                and id = #{param2.id}
            </if>
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and device_name = #{param2.deviceName}
                and device_name like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and device_type = #{param2.deviceType}
@@ -55,29 +59,8 @@
            <if test="param2.source != null and param2.source != ''">
                and source = #{param2.source}
            </if>
            <if test="param2.remark != null and param2.remark != ''">
                and remark = #{param2.remark}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            <if test="param2.belongDept != null and param2.belongDept != ''">
                and belong_dept = #{param2.belongDept}
            </if>
        </where>
    </select>