|
@@ -64,7 +64,8 @@ public class TerminalPortController {
|
|
|
Page<TerminalPort> terminalPortPage = new Page<>();
|
|
|
if (ObjectUtil.isEmpty(locationId)){
|
|
|
terminalPortPage = portService.page(page, new QueryWrapper<TerminalPort>().lambda()
|
|
|
- .eq(ObjectUtil.isNotEmpty(portPageByLocationIdParam.getStatus()), TerminalPort::getStatus, portPageByLocationIdParam.getStatus()));
|
|
|
+ .eq(ObjectUtil.isNotEmpty(portPageByLocationIdParam.getStatus()), TerminalPort::getStatus, portPageByLocationIdParam.getStatus())
|
|
|
+ .isNotNull(TerminalPort::getLocationId));
|
|
|
}else {
|
|
|
BasePigpen basePigpen = basePigpenService.getById(locationId);
|
|
|
List<BasePigpen> list = basePigpenService.list(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getFType,4).like(BasePigpen::getOther2, basePigpen.getId()));
|