From 192ae55db8eb197260d9b1eea60dd74e10b47af4 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 17 Jun 2024 11:18:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xymanager_service/impl/TerminalExtServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java index aa5c49f..f3a78ce 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigInteger; @@ -71,7 +72,11 @@ public class TerminalExtServiceImpl implements TerminalExtService { View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); criteria.andIdIsNotNull().andTowerIdIsNotNull().andLineIdIsNotNull().andDyIdIsNotNull(); if (permit.getIsSuper().equals(CommonStatus.DELETE.value())) { - criteria.andIdIn(permit.getTermpList()); + if (CollectionUtils.isEmpty(permit.getTermpList())) { + criteria.andIdEqualTo(-1); + } else { + criteria.andIdIn(permit.getTermpList()); + } } if (vo.getTowerId() != null && vo.getTowerId() > 0) { criteria.andTowerIdEqualTo(vo.getTowerId());