From 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index 1ec7411..281c1ce 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -206,6 +206,27 @@
return ResponseValue.success(export);
}
+ @GetMapping("/deptListByModel2")
+ public ResponseValue deptListByModel2() {
+ LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
+ LDeptFormScrappedQry query = new LDeptFormScrappedQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ String tenantId = sysInfo.getTenantId();
+ String paramAgencyId = param.getAgencyId();
+ if (StringUtils.isEmpty(paramAgencyId) || !paramAgencyId.startsWith(tenantId)) {
+ param.setAgencyId(tenantId);
+ }
+ return ResponseValue.success(depFormScrappedService.listByModel2(param));
+ }
+
+
// public static void main(String[] args) {
// TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\浣庡�兼槗鑰楀搧\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
// exportParams.setHeadingStartRow(2);
--
Gitblit v1.9.1