Newspaper преди 1 година
родител
ревизия
5013ec108a
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      huimv-env-admin/src/main/java/com/huimv/env/admin/controller/TerminalPortController.java

+ 2 - 1
huimv-env-admin/src/main/java/com/huimv/env/admin/controller/TerminalPortController.java

@@ -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()));