From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
index 24ece38..c00d02f 100644
--- a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
+++ b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
@@ -4,15 +4,18 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.DispatchUnitQueryDTO;
import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
import com.doumee.dao.business.model.DispatchUnit;
import com.doumee.service.business.DispatchUnitService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -41,7 +44,7 @@
}
@PreventRepeat
- @ApiOperation("娣诲姞宸ョ")
+ @ApiOperation("娣诲姞鏂规宸ョ")
@PostMapping("/createSolution")
@RequiresPermissions("business:dispatchunit:create")
public ApiResponse createSolution(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
@@ -91,6 +94,8 @@
@PostMapping("/page")
@RequiresPermissions("business:dispatchunit:query")
public ApiResponse<PageData<DispatchUnit>> findPage (@RequestBody PageWrap<DispatchUnit> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
return ApiResponse.success(dispatchUnitService.findPage(pageWrap));
}
@@ -98,13 +103,16 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:dispatchunit:exportExcel")
public void exportExcel (@RequestBody PageWrap<DispatchUnit> pageWrap, HttpServletResponse response) {
+
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
ExcelExporter.build(DispatchUnit.class).export(dispatchUnitService.findPage(pageWrap).getRecords(), "娲鹃仯鍗曚綅淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:dispatchunit:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse<DispatchUnit> findById(@PathVariable Integer id) {
return ApiResponse.success(dispatchUnitService.detailById(id));
}
--
Gitblit v1.9.3