|
@@ -53,7 +53,9 @@ public class GatewayController {
|
|
|
@PostMapping("/page")
|
|
|
public Result page(@RequestBody GateWayPageParam gateWayPageParam){
|
|
|
Page<Gateway> page = new Page<>(gateWayPageParam.getPageNum(),gateWayPageParam.getPageSize());
|
|
|
- Page<Gateway> gatewayPage = gatewayService.page(page,new QueryWrapper<Gateway>().lambda().eq(Gateway::getFarmId,gateWayPageParam.getFarmId()));
|
|
|
+ Page<Gateway> gatewayPage = gatewayService.page(page,new QueryWrapper<Gateway>().lambda()
|
|
|
+ .eq(Gateway::getFarmId,gateWayPageParam.getFarmId())
|
|
|
+ .like(ObjectUtil.isNotEmpty(gateWayPageParam.getDeviceCode()),Gateway::getDeviceCode,gateWayPageParam.getDeviceCode()));
|
|
|
return new Result(ResultCode.SUCCESS,gatewayPage);
|
|
|
}
|
|
|
|