From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a43112b..af3164f 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
@@ -54,6 +54,7 @@
/**
* 住户-标签 自定义新增或修改
+ *
* @param householdLabel
* @return
*/
@@ -64,10 +65,10 @@
householdLabel.setLabelName(labelEntity.getLabelName());
// 判断同一个住户同一个标签是否已存在，已存在则更新，不存在则新增
QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("household_id",householdLabel.getHouseholdId())
- .eq("label_id",householdLabel.getLabelId());
+ queryWrapper.eq("household_id", householdLabel.getHouseholdId())
+ .eq("label_id", householdLabel.getLabelId());
UserHouseLabelEntity one = getOne(queryWrapper);
- if (null != one){
+ if (null != one) {
householdLabel.setId(one.getId());
// 更新
return updateById(householdLabel);
@@ -94,4 +95,9 @@
public IPage<HouseholdLabelVO> statisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) {
return page.setRecords(baseMapper.statisticalLabels(page, householdLabel));
}
+
+ @Override
+ public IPage<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) {
+ return page.setRecords(baseMapper.getCommunityStatisticalLabels(page, householdLabel));
+ }
}
--
Gitblit v1.9.3