TRX 1 an în urmă
părinte
comite
853e1db195

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

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.visitor.setting;
 
+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;
@@ -27,6 +28,13 @@ public class VisitorSettingModel extends SuperModel {
     @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 Lists.newArrayList();
+    }
+
     private String visitorRoleNames = "";
 
     public String getVisitorRoleNames() {

+ 11 - 9
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/visitor/VisitorMainController.java

@@ -53,12 +53,18 @@ public class VisitorMainController {
         return this.visitorMainService.deleteInfo(param.getId());
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "所有数据列表-分页查询", description = "数据列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<VisitorMainModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) VisitorMainSearch param) {
+        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
+        return visitorMainService.page(param, pageable);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "我的审核列表-分页查询", description = "数据列表-分页查询")
     @RequestMapping(value = {"myReViewPage"}, method = {RequestMethod.POST})
-    public ResultContent<Page<VisitorMainModel>> myReViewPage(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) VisitorMainSearch param) {
+    public ResultContent<Page<VisitorMainModel>> myReViewPage(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) VisitorMainSearch param) {
         Assert.hasText(param.getProjectOid(), "projectOid不能为空");
         String visitorUserId = "";
         if (authHelper.getCurrentUser() != null) {
@@ -71,9 +77,7 @@ public class VisitorMainController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "我的申请列表-分页查询(已登录的)", description = "数据列表-分页查询")
     @RequestMapping(value = {"myApplyPage"}, method = {RequestMethod.POST})
-    public ResultContent<Page<VisitorMainModel>> myApplyPage(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) VisitorMainSearch param) {
+    public ResultContent<Page<VisitorMainModel>> myApplyPage(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) VisitorMainSearch param) {
         Assert.hasText(param.getProjectOid(), "projectOid不能为空");
         String applyUserId = "";
         if (authHelper.getCurrentUser() != null) {
@@ -85,9 +89,7 @@ public class VisitorMainController {
 
     @Operation(summary = "我的申请列表-分页查询(未登录的)", description = "数据列表-分页查询")
     @RequestMapping(value = {"myApplyPageUnLogin"}, method = {RequestMethod.POST})
-    public ResultContent<Page<VisitorMainModel>> myApplyPageUnLogin(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) VisitorMainSearch param) {
+    public ResultContent<Page<VisitorMainModel>> myApplyPageUnLogin(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) VisitorMainSearch param) {
         Assert.hasText(param.getProjectOid(), "projectOid不能为空");
         Assert.hasText(param.getOpenId(), "openId不能为空");
         return visitorMainService.page(param, pageable);