From df3b5fc6bd133ef2e02271513ebd6ce087e87be6 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 3 Jul 2024 10:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3excel=E5=AF=BC=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imdroid/beidou/controller/GnssCalcDataController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java index 24534ff4..a3991e7b 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java @@ -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; }