From 3dbc3273c79da9fea16e661a241e58596c8eac93 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 23 May 2025 14:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/bonus/imgTool/backstage/entity/Photo.java    | 1 +
 .../com/bonus/imgTool/backstage/service/DownloadService.java   | 1 +
 src/main/resources/mappers/backstage/SynthesisQueryMapper.xml  | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/imgTool/backstage/entity/Photo.java b/src/main/java/com/bonus/imgTool/backstage/entity/Photo.java
index c170d7b..6316c71 100644
--- a/src/main/java/com/bonus/imgTool/backstage/entity/Photo.java
+++ b/src/main/java/com/bonus/imgTool/backstage/entity/Photo.java
@@ -17,4 +17,5 @@ public class Photo {
     private String uploadTypeName;
     private String sourceTypeName;
     private String title;
+    private String vioPlace;
 }
diff --git a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java
index 7c7e1b7..0c45618 100644
--- a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java
+++ b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java
@@ -150,6 +150,7 @@ public class DownloadService {
         sb.append(photo.getUploadTypeName()).append(File.separator);
         if(!Objects.equals(photo.getUploadType(),"5")){
             String[] sourceTypeNameArr = photo.getSourceTypeName().split("-");
+            sb.append(photo.getVioPlace()).append(File.separator);
             sb.append(sourceTypeNameArr[1]).append(File.separator);
         }else{
             sb.append(photo.getTitle()).append(File.separator);
diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
index 104b724..25d3397 100644
--- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
+++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
@@ -466,7 +466,8 @@
                    WHEN '5' THEN '重要事项及宣传类'
                    ELSE '' END                                                    AS uploadTypeName,
                A.dict_name                                                        AS sourceTypeName,
-               tcq.title
+               tcq.title,
+               tcq.vio_place AS vioPlace
         FROM tb_comprehensive_query tcq
                  LEFT JOIN sys_file_resource sfr
                            ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'