From c9f51080a05150c3d9242e24f20b9b4d9a02893a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com>
Date: Wed, 12 Jul 2023 18:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=A5=A8=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=9F=E6=88=90=E5=88=A4=E6=96=ADnull=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ticket/twoTicket/service/impl/TicketCountServiceImpl.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
index 379f1d9..06e48ed 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
 import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService;
@@ -19,6 +20,7 @@ import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountResponseVo;
 import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService;
+import jodd.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -326,10 +328,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCount.setTenantId(user.getTenantId());
             ticketCount.setCreateDept(Long.valueOf(user.getDeptId()));
             ticketCount.setCreateUser(user.getUserId());
-            if (entry.getKey() == null) {
-                continue;
-            }
-            if (entry.getKey() != null) {
+            log.info("getStandardTicketCountList  entry.getKey() ================================================> " + entry.getKey());
+            if (ObjectUtils.isNotEmpty(entry.getKey())) {
                 //根据id获取部门名称
                 R<String> deptName = systemClient.getDeptName(entry.getKey());
                 if (deptName.isSuccess()) {
@@ -396,7 +396,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             TicketCount ticketCount = new TicketCount();
             ticketCount.setDeptId(entry.getKey());
             ticketCount.setDateTime(dateTime);
-            if (entry.getKey() != null) {
+            log.info("getTicketCountList entry.getKey() ================================================> " + entry.getKey());
+            if (ObjectUtils.isNotEmpty(entry.getKey())) {
                 //根据id获取部门名称
                 R<String> deptName = systemClient.getDeptName(entry.getKey());
                 if (deptName.isSuccess()) {