From 771ea4868a4db943172ca11899a55987963e6d56 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 Oct 2023 09:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6->=E5=90=8D?=
 =?UTF-8?q?=E7=89=8C=E6=A0=87=E7=AD=BEURL=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLibraryBaseServiceImpl.java  | 12 ++++++++++--
 .../modules/project/entity/ProjectLibraryBase.java   |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
index ddfb25845..9e4d6b8d3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
@@ -226,8 +226,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 
 		if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
 			String valueTemp = UUID.randomUUID().toString().replace("-", "");
-			projectLibraryBase.setBrandLabel(valueTemp);
-
 			List<OSSFile> oSSFileList = new ArrayList<>();
 			for (String fileId : projectLibraryBase.getBrandLabel().split(",")) {
 				OSSFile ossFile = new OSSFile();
@@ -236,6 +234,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				oSSFileList.add(ossFile);
 			}
 			iOSSFileService.updateFileInfo(oSSFileList);
+
+			projectLibraryBase.setBrandLabel(valueTemp);
 		}
 		save(projectLibraryBase);
 
@@ -1528,6 +1528,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				String dutyDepartName = platformProjectLawsInventoryEOService.disposeShowDictItemValue(sysDictItems, projectLibraryBase.getDutyDepart(), cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 				projectLibraryBase.setDutyDepartName(dutyDepartName);
 			}
+			//名牌标签
+			if(StringUtils.isNotBlank(projectLibraryBase.getBrandLabel())){
+				List<OSSFile> fileList = iOSSFileService.getFileInfosByConnectId(projectLibraryBase.getBrandLabel());
+				if(ObjectUtils.isNotEmpty(fileList)){
+					List<String> urlList = fileList.stream().map(OSSFile::getUrl).collect(Collectors.toList());
+					projectLibraryBase.setUrlList(urlList);
+				}
+			}
 
 			if(disposeTargetMarketFlag){
 				if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index a26c94a13..0fa5d5c54 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -263,6 +263,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField(exist = false)
+    private List<String> urlList;
+
 
     @Override
     public int compareTo(ProjectLibraryBase o) {