|
|
@@ -208,15 +208,15 @@ public class DevicePermissIotService {
|
|
|
String userId = devicePermiss.getUserId();
|
|
|
String projectOid = devicePermiss.getProjectOid();
|
|
|
UserAccount account = devicePermiss.getUserAccount();
|
|
|
+ userPermiss.setUid(userId);
|
|
|
if (ObjectUtils.isNotEmpty(account)) {
|
|
|
- userPermiss.setUserId(userId);
|
|
|
- userPermiss.setUserName(account.getName());
|
|
|
+ userPermiss.setUn(account.getName());
|
|
|
}
|
|
|
|
|
|
// 查询用户的头像
|
|
|
OrgUserFace orgUserFace = orgUserFaceService.getUserFace(userId, projectOid);
|
|
|
if (ObjectUtils.isNotEmpty(orgUserFace)) {
|
|
|
- userPermiss.setFaceImage(orgUserFace.getImg());
|
|
|
+ userPermiss.setFi(orgUserFace.getImg());
|
|
|
}
|
|
|
|
|
|
// 查询用户的卡片
|
|
|
@@ -225,7 +225,7 @@ public class DevicePermissIotService {
|
|
|
if (ObjectUtils.isNotEmpty(list)) {
|
|
|
cardNos = list.stream().filter(it -> it.getCardState() == CardState.Enable).map(it -> it.getCode()).collect(Collectors.toUnmodifiableList());
|
|
|
}
|
|
|
- userPermiss.setCardNos(cardNos);
|
|
|
+ userPermiss.setCNos(cardNos);
|
|
|
}
|
|
|
return userPermiss;
|
|
|
}
|