From 711fd889d23aaf23b9322ee1c91c651467092dfd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 7 Feb 2023 15:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/thrsys/ThrInvWarehouseController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 99498261a..0996ad1d1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -69,10 +69,11 @@ public class ThrInvWarehouseController { List ThrInvWarehouseEntityList = new ArrayList<>(); List thrInvWarehouseEntities = thrInvWarehouseService.selectByPid(invSubWarehouseEntity.getParentId()); for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { - if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) && invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){ + if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) || invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){ //添加集合中 ThrInvWarehouseEntityList.add(thrInvWarehouseEntity); } + } if(ThrInvWarehouseEntityList.size()==0){ invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");