diff --git a/sec-beidou/pom.xml b/sec-beidou/pom.xml
index ba7c6cf7..d14c4b5e 100644
--- a/sec-beidou/pom.xml
+++ b/sec-beidou/pom.xml
@@ -155,7 +155,7 @@
                         </exclude>
                     </excludes>
                 </configuration>
-            </plugin>
+            </plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>11</source><target>11</target></configuration></plugin>
         </plugins>
     </build>
 
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 8a6dc001..7ddb432f 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
@@ -7,8 +7,6 @@ import com.imdroid.beidou.entity.Tenant;
 import com.imdroid.beidou.entity.TenantMapper;
 import com.imdroid.beidou.service.CommonExcelService;
 import com.imdroid.secapi.dto.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -25,8 +23,6 @@ import java.util.List;
  */
 @Controller
 public class GnssCalcDataController extends BasicController implements CommonExcelService<GnssCalcData, GnssCalcData> {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     GnssCalcDataMapper dataMapper;
     @Autowired
@@ -45,14 +41,7 @@ public class GnssCalcDataController extends BasicController implements CommonExc
     @RequestMapping("/gnss/data/list_calc")
     @ResponseBody
     public JSONObject listMsg(HttpSession session, Integer page, Integer limit, String searchParams) {
-        if(searchParams != null) {
-            isJoinQuery = searchParams.contains("parentid");
-        }
-        else isJoinQuery = false;
-        logger.info("gnss calc data query begin...join={} ",isJoinQuery);
-        JSONObject result = this.pageList(session, page, limit, searchParams);
-        logger.info("gnss calc data query done.");
-        return result;
+        return this.pageList(session, page, limit, searchParams);
     }
 
     /**
@@ -89,6 +78,14 @@ public class GnssCalcDataController extends BasicController implements CommonExc
         this.export(session, request, response);
     }
 
+    @Override
+    public void checkSearchParams(JSONObject search){
+        if(search != null) {
+            String parentId = search.getString("sl_d.parentid");
+            isJoinQuery = (parentId != null && !parentId.isBlank());
+        }
+        else isJoinQuery=false;
+    }
     @Override
     public MPJQueryWrapper<GnssCalcData> prepareQueryWrapper() {
         if(isJoinQuery) {
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
index 55817f94..12ccc7db 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
@@ -100,20 +100,26 @@ public interface CommonExcelService<T, R> {
     default JSONObject pageList(HttpSession session, Integer page, Integer limit, String searchParams) {
         Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit);
 
-        AbstractWrapper queryWrapper = prepareQueryWrapper();
+        // 检查查询条件
+        JSONObject search = null;
+        if (searchParams != null) {
+            search = (JSONObject) JSONObject.parse(searchParams);
+        }
+        checkSearchParams(search);
 
+        // 构造wrapper
+        AbstractWrapper queryWrapper = prepareQueryWrapper();
         Integer tenantId = (Integer) session.getAttribute(SessionUtils.SESSION_TENANT_ID);
         if (tenantId != null && tenantId != Tenant.SAAS_PROVIDER_ID) {
             queryWrapper.eq(tenantIdField(), tenantId);
         }
-
-        // 条件查询
-        if (searchParams != null) {
-            JSONObject search = (JSONObject) JSONObject.parse(searchParams);
+        if (search != null) {
             for (Map.Entry<String, Object> entry : search.entrySet()) {
                 setQueryWrapper(queryWrapper, entry.getKey(), entry.getValue());
             }
         }
+
+        // 查询
         IPage<R> cs = null;
         if (isJoinSelect()) {
             MPJBaseMapper baseMapper = (MPJBaseMapper) getMapper();
@@ -172,6 +178,8 @@ public interface CommonExcelService<T, R> {
         EasyExcel.write(response.getOutputStream(), getEntityClass()).sheet("sheet").doWrite(cs);
     }
 
+    default void checkSearchParams(JSONObject search){}
+
     /**
      * 设置查询条件
      *