From 1e9fe530b299f9bf1004a983be6fea266b4e8ddc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 03 十一月 2023 15:02:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ContractController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ContractController.java b/src/main/java/com/zy/crm/manager/controller/ContractController.java
index 0e120e9..4ec0053 100644
--- a/src/main/java/com/zy/crm/manager/controller/ContractController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ContractController.java
@@ -105,7 +105,13 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",1);
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
wrapper.or().eq("host_id",1);
@@ -240,7 +246,11 @@
/////////////////////////鐢熸垚Tab琛ㄦ牸鏁版嵁/////////////////////////
String fileName = this.getClass().getClassLoader().getResource("contractTemplate/" + contractTemplate + ".docx").getPath();//鑾峰彇鏂囦欢璺緞
- return WordUtils.generate(fileName, map, tabParam);
+
+// String outPdfPath = fileName.split("\\.")[0]+".pdf";
+ ResponseEntity<InputStreamResource> generate = WordUtils.generate(fileName, map, tabParam);
+// WordUtils.documents4jWordToPdf(fileName,outPdfPath);
+ return generate;
} catch (Exception e) {
return null;
}
--
Gitblit v1.9.1