From 99227c34ea9967aacc087138795d1b99965b0345 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 14:36:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
index 2994d1d..d5bfbc8 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
@@ -38,6 +38,7 @@
<if test="attach.resultType!=null">
and result_type = #{attach.resultType}
</if>
+ and result_type in (1,2,3,4,5)
order by create_time desc,id desc
</select>
<select id="findAiAttachImages" resultType="org.sxkj.resource.vo.AttachVO">
@@ -69,7 +70,6 @@
and info.is_deleted = 0
and attach.is_thumbnail = 0
and (rela.is_deleted = 0 or rela.is_deleted is null)
- and attach.is_generate_ai_img = 0
and wj.`status` in (2, 3, 5, 6, 7)
<if test="attach.jobName!=null and attach.jobName!=''">
and wj.name like concat('%',#{attach.jobName},'%')
@@ -851,7 +851,6 @@
a.is_thumbnail,
a.longitude,
a.latitude,
- a.is_generate_ai_img,
a.media_category,
a.media_create_time,
a.is_deleted
--
Gitblit v1.9.3