From 30aa41300cecbd72ff99eca36f38173129e9e79d Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 7 Jan 2020 13:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=B8=82=E5=8C=97=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=8C=96=E5=B9=B3=E5=8F=B0=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/modules/item/dao/ItemDao.java | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 6c09497b7..aeeda5137 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -204,6 +204,6 @@ public interface ItemDao extends BaseDao { * @author liuchuang * @since 2019/12/25 19:23 */ - void deleteBatchItemHandleIds(List ids); + void deleteBatchItemHandleIds(@Param("ids") List ids); } 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 ce41affcf..33310165e 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 @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.item.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; @@ -1106,7 +1107,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取历史处理记录 List oldLogs = gridPlatformHandleLogService.listOfHandleProcessLogByItemGridPlatFormId(itemGridPlatformId); // 删除项目处理进度表历史记录 - baseDao.deleteBatchItemHandleIds(oldLogs); + if (!CollUtil.isEmpty(oldLogs)) { + baseDao.deleteBatchItemHandleIds(oldLogs); + } // 删除网格化平台处理记录表记录 gridPlatformHandleLogService.removeHandleProcessByItemGridPlatFormId(itemGridPlatformId); }