diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java b/fill-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java index 9b444eae1db5ca07476de18e3ad1f6bb22492993..2f7b9f00f59e41a9de98ca310be03518d67bec79 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java @@ -14,6 +14,6 @@ public class HomeQueryPdu { private String title; - private String devicenum; + private String deviceCode; } diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java b/fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java index 69f816853d4ed27d05dcfbac4438dd650c86384e..cdea0ac7e5eeb81a27edc6ad56355bb59972a1fc 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java @@ -158,8 +158,8 @@ public class HomeController extends BaseJsonBodyController { DeptPdu deptPdu = new DeptPdu(); deptPdu.setSiteId(queryPdu.getSiteId()); deptPdu.setSize(-1); - if(!ObjectUtils.isEmpty(queryPdu.getDevicenum())){ - List<Long> deptIdList = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(queryPdu.getDevicenum())).stream().map(item -> item.getDeptId()).collect(Collectors.toList()); + if(!ObjectUtils.isEmpty(queryPdu.getDeviceCode())){ + List<Long> deptIdList = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(queryPdu.getDeviceCode())).stream().map(item -> item.getDeptId()).collect(Collectors.toList()); deptPdu.setIdList(deptIdList); } String resp = apiBaseManagerFeign.getDeptByQuery(deptPdu);