From 3b5009f4759d7ee05971b6321bbfc49eb0cf5a4b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 05 十一月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index ad6a0e6..bbb93a5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -56,6 +56,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -348,6 +349,9 @@
List<String> strings2 = Arrays.asList(halfNames.split(","));
model.addAttribute("halfNames",strings2);
model.addAttribute("halfName",strings2.get(0));
+ }else {
+ model.addAttribute("halfNames", Collections.emptyList());
+ model.addAttribute("halfName", "");
}
// 显式传递运营商ID和是否可预约字段，确保回显正确
model.addAttribute("operatorId", site.getOperatorId());
@@ -442,6 +446,9 @@
List<String> strings2 = Arrays.asList(halfNames.split(","));
model.addAttribute("halfNames",strings2);
model.addAttribute("halfName",strings2.get(0));
+ }else {
+ model.addAttribute("halfNames", Collections.emptyList());
+ model.addAttribute("halfName", "");
}
List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
--
Gitblit v1.7.1