解决excel导出bug
This commit is contained in:
parent
38a1f1c64b
commit
df3b5fc6bd
@ -141,8 +141,7 @@ public class GnssCalcDataController extends BasicController implements CommonExc
|
||||
if(search != null) {
|
||||
String parentId = search.getString("sl_d.parentid");
|
||||
String projectId = search.getString("sl_d.project_id");
|
||||
isJoinQuery = (parentId != null && StringUtils.hasText(parentId)) ||
|
||||
(projectId != null && StringUtils.hasText(projectId));
|
||||
isJoinQuery = StringUtils.hasText(parentId) || StringUtils.hasText(projectId);
|
||||
}
|
||||
else isJoinQuery=false;
|
||||
}
|
||||
@ -151,8 +150,8 @@ public class GnssCalcDataController extends BasicController implements CommonExc
|
||||
isJoinQuery=false;
|
||||
if(enu != null) {
|
||||
while (enu.hasMoreElements()) {
|
||||
if(enu.nextElement().contains("d.parentid") ||
|
||||
enu.nextElement().contains("d.project_id")){
|
||||
String item = enu.nextElement();
|
||||
if(item.contains("d.parentid") || item.contains("d.project_id")){
|
||||
isJoinQuery = true;
|
||||
break;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user