Commit 165cf1fb authored by 赵啸非's avatar 赵啸非

添加设备相关

parent 37ff8b9f
Pipeline #2554 canceled with stages
......@@ -28,5 +28,5 @@ public class MatterDatumVo extends BaseEntityLong {
private Integer pub;
private String devicenum;
private String deviceCode;
}
\ No newline at end of file
......@@ -158,8 +158,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
return matterDatumInfo;
}).collect(Collectors.toList());
if(!ObjectUtils.isEmpty(query.getDevicenum())){
Set<Long> matterSet = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(query.getDevicenum())).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
if(!ObjectUtils.isEmpty(query.getDeviceCode())){
Set<Long> matterSet = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(query.getDeviceCode())).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
Iterator<MatterDatumInfo> iterator = collect.iterator();
while (iterator.hasNext()) {
MatterDatumInfo next = iterator.next();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment