From cabf2cffb64e98401d87c2e03537720390e2f4ea Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 05 九月 2024 10:01:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/com/yc/action/grid/GTGrid.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/com/yc/action/grid/GTGrid.java b/src/com/yc/action/grid/GTGrid.java
index 4130b3c..0110bc8 100644
--- a/src/com/yc/action/grid/GTGrid.java
+++ b/src/com/yc/action/grid/GTGrid.java
@@ -5711,13 +5711,17 @@
//澶嶅崟涓嶉渶瑕佸垎椤� by danaus 2023-08-17 09:46
page.setPageSize(MAX_RECORD);
}
- if (-1 == page.getFlag() && (type.equalsIgnoreCase("2") || type.equalsIgnoreCase("17")|| type.equalsIgnoreCase("497")))//2,16绫诲瀷鐨勫鍑烘墽琛岃繖涓�
+ if (-1 == page.getFlag() && (type.equalsIgnoreCase("2") ||type.equalsIgnoreCase("20") || type.equalsIgnoreCase("17")|| type.equalsIgnoreCase("497")))//2,16绫诲瀷鐨勫鍑烘墽琛岃繖涓�
{
if (page.getWhere() != null && page.getWhere().trim().indexOf("and") == 0)
page.setWhere(" 1=1 " + page.getWhere());
try {
SpObserver.setDBtoInstance("_" + dbid);
- String fields = gridService.getSimpleJdbcTemplate().queryForObject("select fields = stuff((select ','+cast(fieldid as varchar) from gField where formid=? and isnull(headflag,0)=0 and isnull(isExport,0)=1 for xml path('')),1,1,'') ", String.class, page.getFormid());
+ int headflag=0;
+ if(type.equalsIgnoreCase("20")){
+ headflag=1;
+ }
+ String fields = gridService.getSimpleJdbcTemplate().queryForObject("select fields = stuff((select ','+cast(fieldid as varchar) from gField where formid=? and isnull(headflag,0)="+headflag+" and isnull(isExport,0)=1 for xml path('')),1,1,'') ", String.class, page.getFormid());
if (org.apache.commons.lang3.StringUtils.isBlank(fields)) {
throw new ApplicationException(page.getFormid() + "-娌℃湁闇�瑕佸鍑虹殑瀛楁锛岃鍦�9802璁剧疆鍕鹃�夐渶瑕佸鍑虹殑瀛楁");
}
--
Gitblit v1.8.0