|
@@ -203,7 +203,7 @@ public class DevicePermissService extends SuperService {
|
|
|
}
|
|
}
|
|
|
// 通知权限下发
|
|
// 通知权限下发
|
|
|
String projectOid = list.get(0).getProjectOid();
|
|
String projectOid = list.get(0).getProjectOid();
|
|
|
- List<String> deviceIds = list.stream().map(it->it.getDeviceId()).collect(Collectors.toUnmodifiableList());
|
|
|
|
|
|
|
+ List<String> deviceIds = list.stream().map(it -> it.getDeviceId()).collect(Collectors.toUnmodifiableList());
|
|
|
devicePermissEventService.sendDeviceChangeEvent(deviceIds, projectOid);
|
|
devicePermissEventService.sendDeviceChangeEvent(deviceIds, projectOid);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -372,6 +372,8 @@ public class DevicePermissService extends SuperService {
|
|
|
List<CardInfo> cardInfoList = cardMap.get(userId);
|
|
List<CardInfo> cardInfoList = cardMap.get(userId);
|
|
|
if (ObjectUtils.isNotEmpty(cardInfoList)) {
|
|
if (ObjectUtils.isNotEmpty(cardInfoList)) {
|
|
|
permiss.setCNos(cardInfoList.stream().map(it -> it.getCode()).collect(Collectors.toList()));
|
|
permiss.setCNos(cardInfoList.stream().map(it -> it.getCode()).collect(Collectors.toList()));
|
|
|
|
|
+ } else {
|
|
|
|
|
+ permiss.setCNos(List.of("unKnow"));
|
|
|
}
|
|
}
|
|
|
map.put(userId, permiss);
|
|
map.put(userId, permiss);
|
|
|
}
|
|
}
|