From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index 833c524..ab74953 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -186,13 +186,13 @@
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
@@ -1796,13 +1796,13 @@
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
--
Gitblit v1.7.1