From 764f045c785959117db3d27d744e63d2dad6240c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 13 十一月 2023 09:04:41 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..78850fe 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
@@ -35,6 +35,7 @@
import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
import org.apache.http.HttpResponse;
+import org.apache.poi.ss.formula.functions.T;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
@@ -470,18 +471,19 @@
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<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
- map.put("space_id",integer1.toString());
+ map.put("space_id",site.getStoreId().toString());
+ map.put("area_id",integer1.toString());
String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
// 添加门禁
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
- String spaceId = data.getString("space_id");
// Integer integer = Integer.valueOf(spaceId);
if(StringUtils.hasLength( site.getIds())) {
for (String s1 : site.getIds().split(",")) {
@@ -629,9 +631,13 @@
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);;
+ List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, objectId));
+ model.addAttribute("stores",list);
+ }else {
+ model.addAttribute("stores",storeService.list(new QueryWrapper<TStore>().eq("operatorId", 0)));
}
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
@@ -647,7 +653,7 @@
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
- model.addAttribute("stores",stores);
+
return PREFIX + "TSite_add.html";
}
@@ -707,7 +713,9 @@
@ResponseBody
public Object getChangeOne(Integer oneId) {
try {
- return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId,oneId).eq(TStore::getState,1));
+ return storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId",oneId)
+ .eq("state",1));
}catch (Exception e){
e.printStackTrace();
return ERROR;
--
Gitblit v1.7.1