From e16180612c9dfe2e879f79039d4670640867331d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 11:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 1ff8c53..629df64 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
@@ -470,6 +470,7 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
+ site.setOperatorId(UserExt.getUser().getObjectId());
Integer integer1 = siteClient.addSite(site);
HashMap<String, String> map = new HashMap<>();
@@ -629,9 +630,11 @@
Integer objectId = UserExt.getUser().getObjectId();
List<Store> stores = new ArrayList<>();
if (objectType ==2 ){
- stores= storeClient.getStoreByCityManagerId(objectId);
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
+ model.addAttribute("stores",operatorId);
}else if(objectType == 3){
- stores= storeClient.getStoreByStoreStaffId(objectId);;
+ stores= storeClient.getStoreByStoreStaffId(objectId);
+ model.addAttribute("stores",stores);
}
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
@@ -647,7 +650,7 @@
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
- model.addAttribute("stores",stores);
+
return PREFIX + "TSite_add.html";
}
--
Gitblit v1.7.1