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/property/controller/PropertyCompanyController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index e9a28d6..b801321 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCompany/propertyCompany")
@Api(value = "物业公司", tags = "物业公司接口")
-public class PropertyCompanyController extends BladeController {
+public class PropertyCompanyController {
private final IPropertyCompanyService propertyCompanyService;
@@ -80,6 +80,14 @@
public R<IPage<PropertyCompanyVO>> page(PropertyCompanyVO propertyCompany, Query query) {
IPage<PropertyCompanyVO> pages = propertyCompanyService.selectPropertyCompanyPage(Condition.getPage(query), propertyCompany);
return R.data(pages);
+ }
+
+ /**
+ * 物业公司列表查询（不分页）
+ */
+ @GetMapping("/getPropertyCompanyList")
+ public R getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPropertyCompanyList(propertyCompany));
}
/**
@@ -119,7 +127,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyService.deleteLogic(Func.toLongList(ids)));
+ return R.status(propertyCompanyService.removeByIds(Func.toIntList(ids)));
}
--
Gitblit v1.9.3