From 75343bb92dbb00fadec005df6e51c83682ebf863 Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Wed, 5 Nov 2025 10:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=A5=BC=E5=AE=87=E7=A9=BA=E9=97=B4=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/SpaceServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SpaceServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SpaceServiceImpl.java index c30ebd6..56bf62a 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SpaceServiceImpl.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/SpaceServiceImpl.java @@ -1595,8 +1595,7 @@ public class SpaceServiceImpl implements SpaceService { } else { BasicSpaceExample basicSpaceExample = new BasicSpaceExample(); BasicSpaceExample.Criteria criteria = basicSpaceExample.createCriteria(); - Long tempSpaceId = getSpaceIdFromList(dbSpaceList,basicSpace.getUdfSpaceId(),"udf_space_id"); - criteria.andSpaceIdEqualTo(tempSpaceId).andCompanyIdIn(commonOpt.getSelfAndSubCompanyId(companyId)); + Long tempSpaceId = getSpaceIdFromList(dbSpaceList,basicSpace.getUdfSpaceId(),"udf_space_id",basicBuilding.getBuildingId()); criteria.andSpaceIdEqualTo(tempSpaceId).andCompanyIdIn(commonOpt.getSelfAndSubCompanyId(companyId)); basicSpace.setSpaceId(tempSpaceId); basicSpace.setFlag(0); basicSpaceMapperExt.updateByExample(basicSpace,basicSpaceExample); @@ -1611,7 +1610,7 @@ public class SpaceServiceImpl implements SpaceService { } else { BasicSpaceExample basicSpaceExample = new BasicSpaceExample(); BasicSpaceExample.Criteria criteria = basicSpaceExample.createCriteria(); - Long tempSpaceId = getSpaceIdFromList(dbSpaceList,basicSpace.getName(),"name"); + Long tempSpaceId = getSpaceIdFromList(dbSpaceList,basicSpace.getName(),"name",basicBuilding.getBuildingId()); criteria.andSpaceIdEqualTo(tempSpaceId).andCompanyIdIn(commonOpt.getSelfAndSubCompanyId(companyId)); basicSpace.setSpaceId(tempSpaceId); basicSpace.setFlag(0); @@ -1636,12 +1635,12 @@ public class SpaceServiceImpl implements SpaceService { } } - private Long getSpaceIdFromList(List spaceList, String value,String valueType) { + private Long getSpaceIdFromList(List spaceList, String value,String valueType,Long buildingId) { switch (valueType){ case "udf_space_id": for (SpacePageVO spaceItem : spaceList) { if (spaceItem.getUdfSpaceId()!=null){ - if (spaceItem.getUdfSpaceId().equals(value)) { + if (spaceItem.getUdfSpaceId().equals(value) && spaceItem.getBuildingId().equals(buildingId)) { return spaceItem.getSpaceId(); } } @@ -1649,7 +1648,7 @@ public class SpaceServiceImpl implements SpaceService { break; case "name": for (SpacePageVO spaceItem : spaceList) { - if (spaceItem.getSpaceName().equals(value)) { + if (spaceItem.getSpaceName().equals(value) && spaceItem.getBuildingId().equals(buildingId)) { return spaceItem.getSpaceId(); } }