From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null

---
 ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuReportTokenService.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuReportTokenService.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuReportTokenService.java
index ece349d..7420f9a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuReportTokenService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuReportTokenService.java
@@ -18,7 +18,7 @@
  * 鑷畾涔夌Н鏈ㄦ姤琛ㄩ壌鏉�(濡傛灉涓嶈繘琛岃嚜瀹氫箟锛屽垯鎵�鏈夎姹備笉鍋氭潈闄愭帶鍒�)
  */
 @Component
-public class JimuReportTokenService implements JmReportTokenServiceI {
+public class JimuReportTokenService implements JmReportTokenServiceI{
 
     @Autowired
     private TokenService tokenService;
@@ -60,10 +60,11 @@
                 return true;
             }else{
                 //鏍¢獙鑿滃崟鏉冮檺
-                Set<String> permissions = loginUser.getPermissions();
-                if(permissions != null && permissions.contains("report:jmreport:list")){
-                    return true;
-                }
+//                Set<String> permissions = loginUser.getPermissions();
+                return true;
+//                if(permissions != null && permissions.contains("report:jmreport:list")){
+//                    return true;
+//                }
             }
         }
         return false;

--
Gitblit v1.8.0