From 477953629ecf2503ea119c905597d3f236e4530e Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 16:19:21 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java | 17 ++++++++++-------
src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java | 1 +
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
index b064633..d659d22 100644
--- a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
@@ -83,6 +83,7 @@
@TableField("household_id")
private Long householdId;
+ @ApiModelProperty(value = "创建时间", example = "")
@TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
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 3f4341a..3971f67 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
@@ -103,21 +103,24 @@
/**
* 房屋-标签 房屋自定义新增或修改
- * @param householdLabel
+ *
+ * @param userHouseLabelEntity
* @return
*/
@Override
- public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity householdLabel) {
+ public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity userHouseLabelEntity) {
// 查询标签名称
- LabelEntity labelEntity = labelService.getById(householdLabel.getLabelId());
- householdLabel.setLabelName(labelEntity.getLabelName());
+ LabelEntity labelEntity = labelService.getById(userHouseLabelEntity.getLabelId());
+ if (labelEntity != null) {
+ userHouseLabelEntity.setLabelName(labelEntity.getLabelName());
+ }
// 先删除之前的房屋绑定的标签
QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("house_code",householdLabel.getHouseCode())
- .eq("lable_type",2);
+ queryWrapper.eq("house_code", userHouseLabelEntity.getHouseCode())
+ .eq("lable_type", 2);
// 删除
remove(queryWrapper);
// 插入
- return save(householdLabel);
+ return save(userHouseLabelEntity);
}
}
--
Gitblit v1.9.3