|
@@ -2146,8 +2146,14 @@ public class KwfTruckService {
|
|
|
*/
|
|
*/
|
|
|
public TruckDetailResp truckDetail(TruckDetailParam param) {
|
|
public TruckDetailResp truckDetail(TruckDetailParam param) {
|
|
|
log.info("查询司机详情,id:{}", JSON.toJSONString(param));
|
|
log.info("查询司机详情,id:{}", JSON.toJSONString(param));
|
|
|
|
|
+ if (param.getId() == null && (param.getTruckNo() == null || param.getTruckNo().trim().isEmpty())) {
|
|
|
|
|
+ return new TruckDetailResp();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
KwfTruck truck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
|
|
KwfTruck truck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
|
|
|
- .eq(KwfTruck::getId, param.getId()));
|
|
|
|
|
|
|
+ .eq(param.getId() != null, KwfTruck::getId, param.getId())
|
|
|
|
|
+ .eq(param.getTruckNo() != null && !param.getTruckNo().trim().isEmpty(), KwfTruck::getTruckNo, param.getTruckNo())
|
|
|
|
|
+ .last("limit 1"));
|
|
|
if (truck == null) {
|
|
if (truck == null) {
|
|
|
return new TruckDetailResp();
|
|
return new TruckDetailResp();
|
|
|
}
|
|
}
|