From 1a4f00e0b4d24ae72c7d95e31e685d9a2be0aa62 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 13:46:29 +0800
Subject: [PATCH] 机构导入
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 55f8dcc..81cb5cb 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -203,10 +203,11 @@
@GetMapping("/detail/list")
public ResponseValue queryFormOutputDetailList() {
LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
- S_user_core currentUser = this.getCurrentUser();
+ FinSysTenantUser currentUser = this.getSysInfo();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+ formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId()));
PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
return ResponseValue.success(genericPager);
}
@@ -214,7 +215,7 @@
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -250,7 +251,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- downLoadExcel("鍑哄簱鍗�", response, workbook);
+ String filePath = downLoadExcel("鍑哄簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1