From ee9f387a56ca3fd620c56a91c1860201a98f0ca0 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 09:23:26 +0800
Subject: [PATCH] bug：查看敏感信息、员工&门店管理修改问题
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 10 ++++++++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html | 2 +-
cloud-server-account/src/main/resources/mapper/UserIntegralChangesMapper.xml | 2 +-
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/UserIntegral.java | 2 ++
cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java | 2 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 2 +-
6 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java
index a377303..d10a2ae 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java
@@ -34,6 +34,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ /** 积分变动关联的 APP 用户 ID。 */
+ private Integer appUserId;
private String city;
private String province;
private String name;
diff --git a/cloud-server-account/src/main/resources/mapper/UserIntegralChangesMapper.xml b/cloud-server-account/src/main/resources/mapper/UserIntegralChangesMapper.xml
index d8bf479..6f40bfd 100644
--- a/cloud-server-account/src/main/resources/mapper/UserIntegralChangesMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/UserIntegralChangesMapper.xml
@@ -4,7 +4,7 @@
<select id="listAll" resultType="com.dsh.account.entity.UserIntegral">
- select t1.id,t2.province,t2.city,t2.name,t2.phone,t1.type,t1.oldIntegral,t1.newIntegral,t1.category
+ select t1.id,t1.appUserId,t2.province,t2.city,t2.name,t2.phone,t1.type,t1.oldIntegral,t1.newIntegral,t1.category
,t1.insertTime,t1.remark from t_user_integral_changes t1 left join t_app_user t2 on t1.appUserId = t2.id
where 1=1
<if test="query.name !=null and query.name !=''">
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/UserIntegral.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/UserIntegral.java
index c7547d9..0624436 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/UserIntegral.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/UserIntegral.java
@@ -34,6 +34,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ /** 积分变动关联的 APP 用户 ID。 */
+ private Integer appUserId;
private String city;
private String province;
private String name;
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) {
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
index d1003f6..964bf56 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
@@ -53,7 +53,7 @@
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/tIntegral/tIntegral.js"></script>
+<script src="${ctxPath}/modular/system/tIntegral/tIntegral.js?v=20260922-sensitive-view"></script>
<script>
laydate.render({
elem: '#time'
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index b28dda5..30f9881 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -87,7 +87,7 @@
</div>
</div>
<#input id="name" name="门店名称" type="text" value="${item.name}"/>
- <#input id="phone" name="店长手机号" type="text" value="${item.phone}"/>
+ <#input id="phone" name="店长手机号" type="text" value="${managerPhone}"/>
<#input id="userName" name="店长姓名" type="text" value="${managerName}"/>
<div hidden id="longitude" value="${item.lon}"></div>
<div hidden id="latitude" value="${item.lat}"></div>
--
Gitblit v1.7.1