From 1f1b5541a872a0b2d974344df18e0890f414cc9b Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 三月 2024 17:43:59 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java index 2d955d3..2d20e65 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java @@ -101,13 +101,14 @@ .eq("operatorId", 0) .ne("state", 3)); model.addAttribute("storeList",list); + model.addAttribute("operatorId",0); } if (UserExt.getUser().getObjectType()==2){ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>() .eq("operatorId", UserExt.getUser().getObjectId()) .ne("state", 3)); model.addAttribute("storeList",list2); - model.addAttribute("operatorId",UserExt.getUser().getObjectId()); + model.addAttribute("operatorId",0); } if (UserExt.getUser().getObjectType()==3){ List<TStore> list3 = new ArrayList<>(); @@ -246,6 +247,7 @@ .eq("storeId", byId.getStoreId()) .ne("state",3)); model.addAttribute("siteList",siteList); + model.addAttribute("operatorId",byId.getOperatorId()); } if (UserExt.getUser().getObjectType()==2){ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>() -- Gitblit v1.7.1