From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
index 65ae716..dfd04a3 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
@@ -59,9 +59,10 @@
 		// 判断同一个房屋同一个标签是否已存在,已存在则更新,不存在则新增
 		QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("house_code",houseLabel.getHouseCode())
-					.eq("label_id",houseLabel.getLabelId());
+			.eq("label_id",houseLabel.getLabelId());
 		HouseLabelEntity one = getOne(queryWrapper);
 		if (null != one){
+			houseLabel.setId(one.getId());
 			// 更新
 			return updateById(houseLabel);
 		}

--
Gitblit v1.9.3