From 3f5a1738d40a0a5e1a9ed8cf262c6e655fdee2d3 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 16 Nov 2022 17:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/item/service/impl/ItemServiceImpl.java   | 8 ++++----
 .../item/service/impl/PushToCityGridServiceImpl.java      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 7f8a7b246..c410ca608 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -1060,7 +1060,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             wrapper.eq("item_id", resultDTO.getId());
             wrapper.eq("del_flag", "0");
             List<ItemCommentFeedbackEntity> entityList = itemCommentFeedbackDao.selectList(wrapper);
-            if (!entityList.isEmpty()) {
+            if (CollUtil.isNotEmpty(entityList)) {
                 resultDTO.setIsFeedback("1");
             }
         }
@@ -2816,7 +2816,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             String ids = itemList.stream().map(ItemGridPlatformDTO::getTaskid).collect(Collectors.joining(","));
             List<EventProcessBatchHisResultDto> processHistories = shiBeiCityGridApi.getBatchHistoryByRecIds(ids);
             allProcess.addAll(processHistories);
-            if (processHistories.isEmpty()) {
+            if (CollUtil.isEmpty(processHistories)) {
                 // 失败的时候保存接口调用日志，成功就不需要了
                 this.saveInterfaceLog(StringUtils.EMPTY, InterfaceLogBusinessTypeEnum.PULL_ITEM_HANDLE_PROCESS.getValue(),
                         ApiConstants.SearchCaseProcessByTaskId, YesOrNoEnum.NO.value(), ids, ApiConstants.batchHistoryUrl + "?recIds=" + ids);
@@ -4215,7 +4215,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     private Map<String, Long> listItemHandleDept() {
         List<ItemHandleProcessDTO> list = baseDao.listItemHandleDept();
-        if (list.isEmpty()) {
+        if (CollUtil.isEmpty(list)) {
             return new HashMap<>();
         }
         return list.stream().collect(Collectors.toMap(ItemHandleProcessDTO::getItemId, ItemHandleProcessDTO::getHandlerDeptId, (key1, key2) -> key2));
@@ -5193,7 +5193,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @date 2022/11/15 17:13
      */
     private void imageCheck(List<String> list) {
-        if (list != null && !list.isEmpty()) {
+        if (CollUtil.isNotEmpty(list)) {
             list.forEach(item -> {
                 if (item.contains("wxfile://")) {
                     throw new RenException("图片地址有误，请删除后重新上传");
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index 611721b0a..0295bb706 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.item.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -318,7 +319,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setSqxy(itemEntity.getIssueLongitude() + "," + itemEntity.getIssueLatitude());
             dto.setSqdjrq(DateUtils.format(new Date()));
             List<ImgEntity> list = imgDao.selectListByRefeId(itemDTO.getId());
-            if (!list.isEmpty()) {
+            if (CollUtil.isNotEmpty(list)) {
                 dto.setSqzp(list.stream().map(ImgEntity::getImgUrl).collect(Collectors.joining(",")));
             }
             dto.setSbsm(itemDTO.getReason());