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;
                 }