From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseLabelController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
index 0b1a16b..cc8545d 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.house.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,7 +24,6 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -133,5 +133,18 @@
return R.status(houseLabelService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 房屋-标签 自定义删除
+ */
+ @PostMapping("/removeHouseLabel")
+ @ApiOperationSupport(order = 7)
+ public R removeHouseLabel(@RequestBody HouseLabelEntity houseLabel) {
+ QueryWrapper<HouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("label_id",houseLabel.getLabelId())
+ .eq("house_code",houseLabel.getHouseCode());
+ // 返回
+ return R.status(houseLabelService.remove(wrapper));
+ }
+
}
--
Gitblit v1.9.3