批量上传图片

src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.xml

@@ -538,7 +538,7 @@
             del_flag = 'N'
             AND original_image IS NOT NULL
             AND original_image != ''
-            and order_id = #{orderId}
+            AND order_id = #{orderId}
             UNION
             SELECT
             finished_image AS image_url
@@ -548,7 +548,37 @@
             del_flag = 'N'
             AND finished_image IS NOT NULL
             AND finished_image != ''
-            and order_id = #{orderId}
+            AND order_id = #{orderId}
+            )
+            AND artwork_url NOT IN (
+            SELECT
+            original_artwork AS image_url
+            FROM
+            order_image
+            WHERE
+            del_flag = 'N'
+            AND original_artwork IS NOT NULL
+            AND original_artwork != ''
+            AND order_id = #{orderId}
+            UNION
+            SELECT
+            finished_artwork AS image_url
+            FROM
+            order_image
+            WHERE
+            del_flag = 'N'
+            AND finished_artwork IS NOT NULL
+            AND finished_artwork != ''
+            AND order_id = #{orderId}
+            )
+            AND image_name NOT IN (
+            SELECT DISTINCT
+            image_name
+            FROM
+            order_image
+            WHERE
+            del_flag = 'N'
+            AND order_id = #{orderId}
             )
         </where>
         order by id desc