From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
index 3971f67..ee504de 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.house.dto.UserHouseLabelDTO;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
@@ -61,8 +62,10 @@
@Override
public boolean saveOrUpdateHouseholdLabel(UserHouseLabelEntity householdLabel) {
// 查询标签名称
- LabelEntity labelEntity = labelService.getById(householdLabel.getLabelId());
- householdLabel.setLabelName(labelEntity.getLabelName());
+ if (!Strings.isBlank(householdLabel.getLabelName())) {
+ LabelEntity labelEntity = labelService.getById(householdLabel.getLabelId());
+ householdLabel.setLabelName(labelEntity.getLabelName());
+ }
// 判断同一个住户同一个标签是否已存在，已存在则更新，不存在则新增
QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("household_id", householdLabel.getHouseholdId())
@@ -123,4 +126,14 @@
// 插入
return save(userHouseLabelEntity);
}
+
+ /**
+ * 查询对应的label集合信息
+ * @param labelName
+ * @return
+ */
+ @Override
+ public List<UserHouseLabelEntity> getLabelList(String labelName) {
+ return baseMapper.getLabelList(labelName);
+ }
}
--
Gitblit v1.9.3