From 80b4175382a9030ecb9722d8a080c12a41001871 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 25 十月 2023 09:41:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index e656163..a1e3151 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -880,6 +880,10 @@
@RequestMapping("/yuyuelist")
@ResponseBody
public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if(objectType==3){
+ bookingQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
List<Map<String,Object>> orders = ballClient.listorder(bookingQuery);
System.out.println("=======ballQueryDto=========="+bookingQuery);
--
Gitblit v1.7.1