Merge branch 'refs/heads/分账重构'

This commit is contained in:
zengtao01
2024-09-29 15:39:30 +08:00

View File

@ -83,7 +83,9 @@ public class FaceDeviceInfoServiceImpl implements FaceDeviceInfoService {
List<FaceDeviceInfoDO> list = faceDeviceInfoDOPageResult.getList();
if (CollectionUtil.isNotEmpty(list)){
list.forEach(vo ->{
vo.setCarteenName(carteenMapper.selectById(vo.getCarteenId()).getStoresName());
if(vo.getCarteenId()!=null){
vo.setCarteenName(carteenMapper.selectById(vo.getCarteenId()).getStoresName());
}
});
}
return faceDeviceInfoDOPageResult;