|
|
@ -575,11 +575,13 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo |
|
|
|
String[] sidList = query.getSidList(); |
|
|
|
if (sidList.length > 0) { |
|
|
|
List<String> stringList = Arrays.asList(sidList); |
|
|
|
qw.ne("bvc.modelSid", stringList.get(0)).ne("bvc.configurationItemsSid", stringList.get(1)); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
qw.notIn("bvc.sid", stringList); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehicleStateValue())) { |
|
|
|
qw.eq("bv.vehicleStateValue", query.getVehicleStateValue()); |
|
|
|
qw.eq("bv.createOrg", query.getUseOrgSid()); |
|
|
|
qw.eq("bv.useOrg", query.getUseOrgSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehicleAlias())) { |
|
|
|
qw.like("bvm.vehicleAlias", query.getVehicleAlias()); |
|
|
|