From b18c5b8db781dd2c057ede09d07f4f88d0eaef0b Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期一, 12 六月 2023 18:42:51 +0800
Subject: [PATCH] 列表高级搜索无效
---
src/main/java/com/product/server/report/service/ReportConfigService.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..aa28e6a 100644
--- a/src/main/java/com/product/server/report/service/ReportConfigService.java
+++ b/src/main/java/com/product/server/report/service/ReportConfigService.java
@@ -51,12 +51,18 @@
List<Object> paramList = Lists.newArrayList();
StringBuilder sql = new StringBuilder(512);
+ String queryFilter = " ";
+ if(!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))){
+ queryFilter ="AND"+ queryFilterService.getQueryFilter(fse);
+ }
sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group")
.append("\nFROM product_sys_report_config a")
.append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid")
- .append("\nwhere (function_uuid is null or function_uuid='') ");
+ .append("\nwhere (function_uuid is null or function_uuid='') ")
+ .append(queryFilter);
+
if (!StringUtils.isEmpty(fse.getString(CmnConst.TYPE_UUID))) {
- sql.append("\nand b.type_group=?");
+ sql.append("\nand b.type_group=? ");
paramList.add(fse.getString(CmnConst.TYPE_UUID));
}
return baseDao.listTable(sql.toString(), paramList.toArray(), pageSize, cpage);
@@ -317,7 +323,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 +390,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