From bc68f4393cafe39c4fce614c8128936067ea25f7 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 17:18:17 +0800
Subject: [PATCH] bug:登录问题和操作日志

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 8829ef5..8082caa 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -336,6 +336,8 @@
         User byId1 = userMapper.selectById(byId.getStoreStaffId());
         model.addAttribute("city",byId1);
         model.addAttribute("managerName", byId1 == null ? "" : byId1.getName());
+        // 历史门店的手机号可能只保存在店长账号中,编辑页需与列表保持一致地回填可用手机号。
+        model.addAttribute("managerPhone", resolveStoreManagerPhone(byId, byId1));
         model.addAttribute("type",1);
         // 如果当前登陆人是运营商
         if (UserExt.getUser().getObjectType()==2){
@@ -418,6 +420,7 @@
         User byId1 = userMapper.selectById(byId.getStoreStaffId());
         model.addAttribute("city",byId1);
         model.addAttribute("managerName", byId1 == null ? "" : byId1.getName());
+        model.addAttribute("managerPhone", resolveStoreManagerPhone(byId, byId1));
         model.addAttribute("type",0);
 
         return PREFIX + "TShop_edit.html";
@@ -768,6 +771,13 @@
         user.setCreatetime(new Date());
         return user;
     }
+
+    private String resolveStoreManagerPhone(TStore store, User storeManager) {
+        if (ToolUtil.isNotEmpty(store.getPhone())) {
+            return store.getPhone();
+        }
+        return storeManager == null ? "" : storeManager.getPhone();
+    }
     @RequestMapping(value = "/onChange")
     @ResponseBody
     public Object onChange(Integer oneId) {

--
Gitblit v1.7.1