From 0d63f52d84e393204af3ba5bce86bdfddf936be8 Mon Sep 17 00:00:00 2001
From: 1821349743@qq.com <1821349743@qq.com>
Date: 星期六, 08 四月 2023 16:39:25 +0800
Subject: [PATCH] 修改报表加载返回html更改为数据

---
 src/main/java/com/product/server/report/service/ReportConfigService.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/product/server/report/service/ReportConfigService.java b/src/main/java/com/product/server/report/service/ReportConfigService.java
index 76180f4..6a8915c 100644
--- a/src/main/java/com/product/server/report/service/ReportConfigService.java
+++ b/src/main/java/com/product/server/report/service/ReportConfigService.java
@@ -317,7 +317,7 @@
 		fseFunction.setValue(CmnConst.FUNCTION_NAME, fseReport.getString(CmnConst.REPORT_NAME));    //鍔熻兘鍚嶇О
 		fseFunction.setValue(CmnConst.FUNCTION_DESCRIPTION, fseReport.getString(CmnConst.REPORT_NAME));    //鍔熻兘鎻忚堪
 		fseFunction.setValue(CmnConst.STATUS_UUID, 1);            //鏄惁鍚敤
-		fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 1);    //鍔熻兘绫诲瀷-涓氬姟鍔熻兘
+		fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 5);    //鍔熻兘绫诲瀷-涓氬姟鍚庡彴绠$悊 绠$悊鍛樺拰鏅�氱敤鎴烽兘鑳藉垎閰嶈鎶ヨ〃鐨勬潈闄�
 		fseFunction.setValue(CmnConst.CLIENT_TYPE_UUID, "Web");        //瀹㈡埛绔被鍨�
 		fseFunction.setValue(CmnConst.VERSION_UUID, "001");
 		fseFunction.setValue(CmnConst.DATA_TYPE, 1);// 鏁版嵁绫诲瀷
@@ -384,11 +384,11 @@
 		// 鎻愬彇鍙戝竷鐨勮鑹茬浉鍏虫暟鎹�
 		List<String> roleUUIDList = Lists.newArrayList();
 		List<String> clientUUIDList = Lists.newArrayList();
-		String[] singleRoleInfoArr;
+		clientUUIDList.add(SpringMVCContextHolder.getCurrentUser().getClientUuid());
+//		String[] singleRoleInfoArr;
 		for (String singleRoleInfo : fse.getString(CmnConst.ROLE_UUID).split("#")) {
-			singleRoleInfoArr = singleRoleInfo.split(",");
-			roleUUIDList.add(singleRoleInfoArr[2]);
-			clientUUIDList.add(singleRoleInfoArr[0]);
+//			singleRoleInfoArr = singleRoleInfo.split(",");
+			roleUUIDList.add(singleRoleInfo);
 		}
 
 		// 2.缁戝畾瑙掕壊(缁欐煇涓�瑙掕壊璧嬩簣璇ュ姛鑳�)

--
Gitblit v1.9.2