From eec665109e32e4bfab6ef06be4e5cd196767fd4e Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Wed, 2 Sep 2026 01:37:47 +0800
Subject: [PATCH] v1.0.30

---
 pom.xml                                           |  2 +-
 .../controller/GaoCustomerPackageController.java  | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index bc7d597..85f6c92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.29</version>
+	<version>1.0.30</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>
diff --git a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerPackageController.java b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerPackageController.java
index 4201756..455ae40 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerPackageController.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerPackageController.java
@@ -71,10 +71,19 @@ public class GaoCustomerPackageController {
 		if (result.getList().isEmpty()) {
 			return result;
 		}
-		fillTransient(result.getList());
-		Map<String, GaoCustomer> customerMap = customerService.mapByIdList(result.getList().stream().map(GaoCustomerPackage::getCustomerId).toList());
+		List<String> customerIdList = result.getList().stream()
+			.map(GaoCustomerPackage::getCustomerId)
+			.filter(value -> value != null && !value.isBlank())
+			.distinct()
+			.toList();
+		Map<String, GaoCustomer> customerMap = customerService.mapByIdList(customerIdList);
+		Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, customerIdList, GaoCustomer.AttachType.PHOTO.name());
 		for (GaoCustomerPackage packageEntity : result.getList()) {
-			packageEntity.setCustomer(customerMap.get(packageEntity.getCustomerId()));
+			GaoCustomer customer = customerMap.get(packageEntity.getCustomerId());
+			if (customer != null) {
+				customer.setAttachmentList(attachmentMap.get(customer.getId()));
+			}
+			packageEntity.setCustomer(customer);
 		}
 		return result;
 	}