From dcb96821f905f3fd93c059d8703517bdcac4d336 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 29 九月 2026 20:02:02 +0800
Subject: [PATCH] 排序问题及门店手机号展示问题
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStoreListVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStoreListVo.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStoreListVo.java
index e614e71..e0a5c03 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStoreListVo.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStoreListVo.java
@@ -47,7 +47,23 @@
* 列表对外的 phone 统一返回可用的店长手机号。
*/
public String getPhone() {
- return (phone == null || phone.trim().isEmpty()) ? userPhone : phone;
+ return hasText(phone) ? phone : defaultString(userPhone);
+ }
+
+ /**
+ * 兼容历史门店：当店长资料中未维护 phone 时，列表仍返回可用的门店手机号。
+ * 返回空字符串而非 null，避免不同环境的 JSON 忽略 null 配置导致字段消失。
+ */
+ public String getUserPhone() {
+ return hasText(userPhone) ? userPhone : defaultString(phone);
+ }
+
+ private boolean hasText(String value) {
+ return value != null && !value.trim().isEmpty();
+ }
+
+ private String defaultString(String value) {
+ return value == null ? "" : value;
}
private String account;
--
Gitblit v1.7.1