|
@@ -87,7 +87,7 @@ public class LapiServiceImpl implements ILapiService {
|
|
|
List<DeviceInfo> deviceList = new ArrayList<>();
|
|
|
for (PersonDeviceRelation personDeviceRelation:listRelation){
|
|
|
DeviceInfo deviceInfo = deviceInfoService.get(personDeviceRelation.getDeviceId());
|
|
|
- if (deviceInfo!=null){
|
|
|
+ if (deviceInfo!=null && !deviceInfo.getDelFlag()){
|
|
|
deviceList.add(deviceInfo);
|
|
|
}
|
|
|
}
|
|
@@ -204,7 +204,7 @@ public class LapiServiceImpl implements ILapiService {
|
|
|
List<DeviceInfo> deviceList = new ArrayList<>();
|
|
|
for (PersonDeviceRelation personDeviceRelation:listRelation){
|
|
|
DeviceInfo deviceInfo = deviceInfoService.get(personDeviceRelation.getDeviceId());
|
|
|
- if (deviceInfo!=null){
|
|
|
+ if (deviceInfo!=null && !deviceInfo.getDelFlag()){
|
|
|
deviceList.add(deviceInfo);
|
|
|
}
|
|
|
}
|