1、修改补传历史数据查询语句的bug
This commit is contained in:
parent
0f6af2c170
commit
f756e347aa
@ -112,7 +112,7 @@ public class Forwarder {
|
||||
List<GnssDeviceJoin> gnssDeviceList;
|
||||
MPJQueryWrapper jquery = null;
|
||||
|
||||
if(resendRecord!=null && resendRecord.getDeviceid()!=null){
|
||||
if(resendRecord!=null && !StringUtils.hasText(resendRecord.getDeviceid())){
|
||||
jquery = new MPJQueryWrapper<GnssDevice> ()
|
||||
.selectAll(GnssDevice.class)
|
||||
.select("d.latitude as latitude")
|
||||
@ -121,7 +121,7 @@ public class Forwarder {
|
||||
.and(warpper->warpper.eq("fwd_group_id", fwdGroupId)
|
||||
.or()
|
||||
.eq("fwd_group_id2", fwdGroupId)).
|
||||
eq("deviceid", resendRecord.getDeviceid());
|
||||
eq("t.deviceid", resendRecord.getDeviceid());
|
||||
}
|
||||
else if(resendRecord!=null && resendRecord.getProjectid()!=null){
|
||||
jquery = new MPJQueryWrapper<GnssDevice> ()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user