From 2d1510060f55ac012cb862363203313744c0432f Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期三, 23 九月 2026 17:48:44 +0800
Subject: [PATCH] ios下载链接更新
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 9b6da05..67d5522 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";
@@ -471,14 +474,22 @@
@ResponseBody
public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
- String roleid = UserExt.getUser().getRoleid();
List<TStoreListVo> list =new ArrayList<>();
- if("3".equals(roleid)){
- Integer objectId = UserExt.getUser().getObjectId();
- list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
- }else {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (Integer.valueOf(3).equals(objectType)) {
+ // 门店员工按员工-门店中间表的数据范围查询；getStoreIdsByUserId 同时兼容
+ // sys_user.objectId 和 t_store.storeStaffId 两种历史归属数据。
+ List<Integer> storeIds = userMapper.getStoreIdsByUserId(UserExt.getUser().getId());
+ if (!CollectionUtils.isEmpty(storeIds)) {
+ list = storeService.listAllStoresByIds(page, provinceCode, cityCode, name, phone, shopName, storeIds);
+ }
+ } else if (Integer.valueOf(2).equals(objectType)) {
Integer objectId = UserExt.getUser().getObjectId();
list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ } else {
+ // 平台账号不带运营商条件，查询全部门店；数据范围由 objectType 决定，
+ // 不能用 roleid（菜单权限）判断，避免员工被授予角色 1 后被误当成运营商。
+ list = storeService.listAll(page, provinceCode, cityCode, name, phone, shopName, null);
}
page.setRecords(list);
return super.packForBT(page);
@@ -698,10 +709,17 @@
}
}
}else {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ // 编辑页提交的是行政区划编码；按 id 查询会导致查不到省、市，随后访问名称时抛出 NPE。
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
+ if (one == null) {
+ return ERROR;
+ }
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
+ if (one1 == null) {
+ return ERROR;
+ }
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -761,6 +779,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