From 4c4bf4cc32a99435777f06bc281fe8e942f7c323 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 12:03:24 +0800
Subject: [PATCH] 修改规约
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 0784857..55fb56c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -276,11 +276,11 @@
CommonUtil.copyProperties(formProcureQry, param2);
formProcureQry = param2;
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
+ formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
@@ -289,7 +289,7 @@
@ApiImplicitParams({
@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<String> export(Long id, HttpServletResponse response) throws Exception {
TemplateExportParams params = new TemplateExportParams("import/閲囪喘鍏ュ簱鍗�.xls");
params.setHeadingStartRow(2);
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -320,7 +320,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
--
Gitblit v1.9.1