From 32106f511657695e79d53e98a350ce70a36f6da1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:07:08 +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 ba075d2..98ae1de 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
@@ -411,6 +411,9 @@
IncomeVO temp = new IncomeVO();
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
+ if(null == competition1){
+ continue;
+ }
if (!competition1.getStoreId().equals("")){
String[] split = competition1.getStoreId().split(",");
List<Integer> list = new ArrayList<>();
@@ -663,6 +666,9 @@
IncomeVO temp = new IncomeVO();
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
+ if(null == competition1){
+ continue;
+ }
if (!competition1.getStoreId().equals("")){
String[] split = competition1.getStoreId().split(",");
List<Integer> list = new ArrayList<>();
--
Gitblit v1.7.1