TRX 1 год назад
Родитель
Сommit
9bb1ea1959

+ 4 - 4
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissIotService.java

@@ -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;
     }

+ 4 - 4
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissService.java

@@ -309,18 +309,18 @@ public class DevicePermissService extends SuperService {
                 } else {
                     permiss = new ProjectUserPermiss();
                 }
-                permiss.setUserId(userId);
+                permiss.setUid(userId);
                 UserAccount userAccount = userMap.get(userId);
                 if (ObjectUtils.isNotEmpty(userAccount)) {
-                    permiss.setUserName(userAccount.getName());
+                    permiss.setUn(userAccount.getName());
                 }
                 OrgUserFace orgUserFace = faceMap.get(userId);
                 if (ObjectUtils.isNotEmpty(orgUserFace)) {
-                    permiss.setFaceImage(orgUserFace.getImg());
+                    permiss.setFi(orgUserFace.getImg());
                 }
                 List<CardInfo> cardInfoList = cardMap.get(userId);
                 if (ObjectUtils.isNotEmpty(cardInfoList)) {
-                    permiss.setCardNos(cardInfoList.stream().map(it -> it.getCode()).collect(Collectors.toList()));
+                    permiss.setCNos(cardInfoList.stream().map(it -> it.getCode()).collect(Collectors.toList()));
                 }
                 map.put(userId, permiss);
             }