瀏覽代碼

更新!

TRX 1 年之前
父節點
當前提交
f6767bfcb6

+ 4 - 3
FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/setting/VisitorSettingModel.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.form.ComponentFormModel;
 import com.zhongshu.card.client.model.org.role.RoleModel;
+import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.apache.commons.lang3.ObjectUtils;
@@ -23,14 +24,14 @@ public class VisitorSettingModel extends SuperModel {
     private String sceneComponentId;
 
     @Schema(description = "被访人类型设置")
-    private List<RoleModel> visitorRoles;
+    private List<RoleSimpleModel> visitorRoles;
 
     @Schema(description = "角色id")
     private List<String> visitorRoleIds = new ArrayList<>();
 
     public List<String> getVisitorRoleIds() {
         if (ObjectUtils.isNotEmpty(visitorRoles)) {
-            return visitorRoles.stream().map(RoleModel::getId).collect(Collectors.toList());
+            return visitorRoles.stream().map(RoleSimpleModel::getId).collect(Collectors.toList());
         }
         return Lists.newArrayList();
     }
@@ -39,7 +40,7 @@ public class VisitorSettingModel extends SuperModel {
 
     public String getVisitorRoleNames() {
         if (ObjectUtils.isNotEmpty(visitorRoles)) {
-            List<String> visitorRoleNames = visitorRoles.stream().map(RoleModel::getName).collect(Collectors.toList());
+            List<String> visitorRoleNames = visitorRoles.stream().map(RoleSimpleModel::getName).collect(Collectors.toList());
             return String.join(",", visitorRoleNames);
         }
         return "";

+ 7 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/RoleServiceImpl.java

@@ -908,6 +908,13 @@ public class RoleServiceImpl extends SuperService {
         return roleModel;
     }
 
+    public List<RoleSimpleModel> toSimpleModels(List<Role> roles) {
+        if (ObjectUtils.isNotEmpty(roles)) {
+            return roles.stream().map(this::toSimpleModel).collect(Collectors.toList());
+        }
+        return Lists.newArrayList();
+    }
+
     public RoleSimpleModel toSimpleModel(Role role) {
         RoleSimpleModel roleModel = new RoleSimpleModel();
         if (ObjectUtils.isNotEmpty(role)) {

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorSettingService.java

@@ -117,7 +117,7 @@ public class VisitorSettingService extends SuperService {
             BeanUtils.copyProperties(entity, model);
 
             // 角色数据
-            model.setVisitorRoles(roleService.toModels(entity.getVisitorRoles()));
+            model.setVisitorRoles(roleService.toSimpleModels(entity.getVisitorRoles()));
         }
         return model;
     }