From e16180612c9dfe2e879f79039d4670640867331d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 11:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index ae4efa1..e62a599 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -356,6 +356,9 @@
}
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
+ if (!competition1.getStoreId().equals("")){
+ String[] split = competition1.getStoreId().split(",");
+ }
Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
IncomeVO temp = new IncomeVO();
temp.setId(competition.getId().intValue());
@@ -601,6 +604,9 @@
coachQuery.setCoachName(coachName);
coachQuery.setCourseName(courseName);
coachQuery.setTime(beginTime);
+ if(UserExt.getUser().getObjectType()==3){
+ coachQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
return cancelledClassesClient.listAll(coachQuery);
}
/**
--
Gitblit v1.7.1