From a88b63c52833433e9270f7641cb39aea9f872172 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 23 Sep 2024 15:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 448a1f0..9b5bb46 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1009,9 +1009,15 @@
//事项来源
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(oneSource)){
+ oneSource = new CaseStatisticsSourceDTO();
+ }
oneSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
CaseStatisticsSourceDTO twoSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(twoSource)){
+ twoSource = new CaseStatisticsSourceDTO();
+ }
twoSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(oneSource.getCaseNum());
--
Gitblit v1.8.0