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){