From b292010a63bb77f5c6b4268d2cdc3b2fbf7f225b Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 26 Jun 2023 22:41:48 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8826=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=BA=AB=E4=BB=BD=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=8B=BC?=
 =?UTF-8?q?=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/statistics/TingKeStatisticsController.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
index 9f1a155d..9e56b7cc 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
@@ -171,8 +171,8 @@ public class TingKeStatisticsController {
                 KcTksfrzb currentData = tksfMap.get(x.getGh());
                 String currentZwmc = currentData.getZwmc();
                 String currentTkyq = currentData.getTkyq();
-                if(StringUtils.isNotBlank(currentTkyq)){
-                    int tkyq = Integer.parseInt(currentTkyq);
+                if(StringUtils.isNotBlank(currentZwmc)){
+                    int tkyq = Integer.parseInt(StringUtils.defaultString(currentTkyq,"0"));
                     int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0"));
                     x.setZwmc(currentZwmc + "、" + x.getZwmc());
                     if(tkyq > xtkyq){
@@ -306,8 +306,8 @@ public class TingKeStatisticsController {
                 KcTksfrzb currentData = tksfMap.get(x.getGh());
                 String currentZwmc = currentData.getZwmc();
                 String currentTkyq = currentData.getTkyq();
-                if(StringUtils.isNotBlank(currentTkyq)){
-                    int tkyq = Integer.parseInt(currentTkyq);
+                if(StringUtils.isNotBlank(currentZwmc)){
+                    int tkyq = Integer.parseInt(StringUtils.defaultString(currentTkyq,"0"));
                     int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0"));
                     x.setZwmc(currentZwmc + "、" + x.getZwmc());
                     if(tkyq > xtkyq){