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 | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 82a76e3..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
@@ -18,10 +18,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
+import org.springblade.modules.house.entity.HouseLabelEntity;
import org.springblade.modules.house.vo.HouseLabelVO;
-import org.springblade.modules.house.mapper.UserHouseLabelMapper;
-import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.mapper.HouseLabelMapper;
+import org.springblade.modules.house.service.IHouseLabelService;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@
* @since 2023-10-28
*/
@Service
-public class HouseLabelServiceImpl extends ServiceImpl<UserHouseLabelMapper, UserHouseLabelEntity> implements IUserHouseLabelService {
+public class HouseLabelServiceImpl extends ServiceImpl<HouseLabelMapper, HouseLabelEntity> implements IHouseLabelService {
@Autowired
private ILabelService labelService;
@@ -51,15 +52,15 @@
* @return
*/
@Override
- public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity houseLabel) {
+ public boolean saveOrUpdateHouseLabel(HouseLabelEntity houseLabel) {
// 查询标签名称
LabelEntity labelEntity = labelService.getById(houseLabel.getLabelId());
houseLabel.setLabelName(labelEntity.getLabelName());
// 判断同一个房屋同一个标签是否已存在，已存在则更新，不存在则新增
- QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("house_code",houseLabel.getHouseCode())
- .eq("label_id",houseLabel.getLabelId());
- UserHouseLabelEntity one = getOne(queryWrapper);
+ .eq("label_id",houseLabel.getLabelId());
+ HouseLabelEntity one = getOne(queryWrapper);
if (null != one){
houseLabel.setId(one.getId());
// 更新
--
Gitblit v1.9.3