解决excel导出bug

This commit is contained in:
weidong 2024-07-03 10:03:43 +08:00
parent 38a1f1c64b
commit df3b5fc6bd

View File

@ -141,8 +141,7 @@ public class GnssCalcDataController extends BasicController implements CommonExc
if(search != null) { if(search != null) {
String parentId = search.getString("sl_d.parentid"); String parentId = search.getString("sl_d.parentid");
String projectId = search.getString("sl_d.project_id"); String projectId = search.getString("sl_d.project_id");
isJoinQuery = (parentId != null && StringUtils.hasText(parentId)) || isJoinQuery = StringUtils.hasText(parentId) || StringUtils.hasText(projectId);
(projectId != null && StringUtils.hasText(projectId));
} }
else isJoinQuery=false; else isJoinQuery=false;
} }
@ -151,8 +150,8 @@ public class GnssCalcDataController extends BasicController implements CommonExc
isJoinQuery=false; isJoinQuery=false;
if(enu != null) { if(enu != null) {
while (enu.hasMoreElements()) { while (enu.hasMoreElements()) {
if(enu.nextElement().contains("d.parentid") || String item = enu.nextElement();
enu.nextElement().contains("d.project_id")){ if(item.contains("d.parentid") || item.contains("d.project_id")){
isJoinQuery = true; isJoinQuery = true;
break; break;
} }