From 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index e729cef..d2f12fc 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -32,14 +32,14 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("company:company:create")
+ @RequiresPermissions("business:company:create")
public ApiResponse create(@RequestBody @Valid CompanyCreatOrUpdateRequest company) {
return ApiResponse.success(companyService.create(company));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("company:company:delete")
+ @RequiresPermissions("business:company:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
companyService.deleteById(id);
return ApiResponse.success(null);
@@ -47,7 +47,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("company:company:delete")
+ @RequiresPermissions("business:company:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
companyService.deleteByIdInBatch(this.getIdList(ids));
return ApiResponse.success(null);
@@ -55,7 +55,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("company:company:update")
+ @RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
companyService.updateById(company);
return ApiResponse.success(null);
@@ -63,14 +63,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("company:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
return ApiResponse.success(companyService.findPage(pageWrap));
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("company:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(companyService.findById(id));
}
@@ -84,7 +84,7 @@
*/
@ApiOperation("骞冲彴鏌ヨ浼佷笟淇℃伅-鍒嗛〉鏌ヨ")
@PostMapping("/findPlatformPage")
-// @RequiresPermissions("company:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPlatformPage(@RequestBody PageWrap<Company> pageWrap){
return ApiResponse.success(companyService.findPlatformPage(pageWrap));
}
@@ -98,8 +98,21 @@
*/
@ApiOperation("鏍规嵁浼佷笟浼佷笟id 鏌ヨ浼佷笟鐢ㄦ埛")
@PostMapping("/findPlatformById")
- @RequiresPermissions("company:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<Company> findPlatformById(@RequestParam Integer companyId){
return ApiResponse.success(companyService.findPlatformById(companyId));
}
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param company 瀹炰綋瀵硅薄
+ */
+ @ApiOperation("鏍规嵁ID淇敼-缂栬緫")
+ @PostMapping("/update")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse update(@RequestBody CompanyCreatOrUpdateRequest company){
+ companyService.updateById(company);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3