From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 4f78a18..6362cc3 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
@@ -116,6 +116,13 @@
pageWrap.setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
return ApiResponse.success(companyService.findList(pageWrap));
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁")
+ @PostMapping("/list")
+ @RequiresPermissions("business:company:query")
+ public ApiResponse<List<Company>> findList (@RequestBody Company pageWrap) {
+ pageWrap.setQueryFlag(Constants.ZERO);//鏌ヨ鍏ㄩ儴鏉冮檺鑼冨洿鍐�
+ return ApiResponse.success(companyService.findList(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@@ -134,7 +141,7 @@
@ApiOperation("浼佷笟璇佷欢涓嬭浇")
@PostMapping("/exportFiles")
- @RequiresPermissions("business:locks:exportExcel")
+ @RequiresPermissions("business:company:exportExcel")
public void exportFiles(@RequestBody Company company,HttpServletResponse response) {
if(company.getId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
--
Gitblit v1.9.3