From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
index 4a3902f..fbf81e1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
@@ -22,6 +22,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IRegionService;
+import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.TOperatorService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
@@ -56,6 +57,12 @@
private String PREFIX = "/system/gateData/";
@Autowired
private TOperatorService operatorService;
+
+ @Autowired
+ private IStoreService storeService;
+
+
+
/**
* 跳转到充值记录页面
*/
@@ -63,6 +70,9 @@
public String index(Model model) {
List<TOperator> list = operatorService.list(new QueryWrapper<TOperator>().ne("state", 3));
model.addAttribute("list",list);
+ model.addAttribute("objectType", UserExt.getUser().getObjectType());
+ TStore tStore = storeService.getById(UserExt.getUser().getObjectId());
+ model.addAttribute("tStore", tStore);
return PREFIX + "GateData.html";
}
/**
--
Gitblit v1.7.1