From 69a1b191f02e49b7c8545c3b42744217f0dc6b8e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 25 Nov 2023 14:47:23 +0800
Subject: [PATCH] 物业公司组织机构关联处理,相关权限限制去除

---
 src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 9db056d..c58bb50 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -28,6 +28,7 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.system.service.IDeptService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.property.entity.PropertyCompanyEntity;
@@ -35,6 +36,8 @@
 import org.springblade.modules.property.wrapper.PropertyCompanyWrapper;
 import org.springblade.modules.property.service.IPropertyCompanyService;
 import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
 
 /**
  * 物业公司 控制器
@@ -121,13 +124,22 @@
 	}
 
 	/**
+	 * 物业公司 自定义新增或修改
+	 */
+	@PostMapping("/saveOrUpdate")
+	public R saveOrUpdate(@Valid @RequestBody PropertyCompanyEntity propertyCompany) {
+		return R.status(propertyCompanyService.saveOrUpdatePropertyCompany(propertyCompany));
+	}
+
+	/**
 	 * 物业公司 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(propertyCompanyService.removeByIds(Func.toIntList(ids)));
+		List<Integer> toIntList = Func.toIntList(ids);
+		return R.status(propertyCompanyService.deleteByIds(toIntList));
 	}
 
 	/**

--
Gitblit v1.9.3