Merge remote-tracking branch 'origin/master'

rain

2026-01-29 faf55275dcb8d413f18642b3410c8e7df9f6cd9c

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml

@@ -37,10 +37,7 @@
        <where>
                and md.is_deleted = 0
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and md.device_name like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="param2.nickname != null and param2.nickname != ''">
                and md.nickname like concat('%',#{param2.nickname},'%')
                and md.nickname like concat('%',#{param2.deviceName},'%')
            </if>
            <if test="param2.deptId != null">
                and md.create_dept = #{param2.deptId}