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 2f2192c2..876ef5e7 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 @@ -27,6 +27,8 @@ public class GnssCalcDataController extends BasicController implements CommonExc GnssCalcDataMapper dataMapper; @Autowired TenantMapper tenantMapper; + boolean isJoinQuery = false; + @RequestMapping("/page/gnss_data_calc") public String gnssData(Model m, HttpSession session) { initModel(m, session); @@ -39,6 +41,10 @@ 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; return this.pageList(session, page, limit, searchParams); } @@ -91,7 +97,7 @@ public class GnssCalcDataController extends BasicController implements CommonExc */ @Override public boolean isJoinSelect() { - return true; + return isJoinQuery; } @Override