From 42a2b64617a0516009b67686dfdbcff58851e6fb Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 19 Jul 2024 14:46:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90-?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1204167459176448]后端-工单查看权限-服务通道 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1204167459176448
---
 .../framework/process/dto/ChannelVo.java      | 54 ++++++-------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
index d1045eab..2a5851d2 100644
--- a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
@@ -1,14 +1,12 @@
 package neatlogic.framework.process.dto;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.google.common.base.Objects;
 import neatlogic.framework.common.constvalue.ApiParamType;
-import neatlogic.framework.common.constvalue.GroupSearch;
 import neatlogic.framework.common.dto.BasePageVo;
 import neatlogic.framework.common.util.CommonUtil;
-import neatlogic.framework.dto.AuthorityVo;
 import neatlogic.framework.restful.annotation.EntityField;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.google.common.base.Objects;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -77,8 +75,11 @@ public class ChannelVo extends BasePageVo {
     @EntityField(name = "common.sla", type = ApiParamType.INTEGER)
     private Integer sla;
 
-    @EntityField(name = "common.authoritylist", type = ApiParamType.JSONARRAY)
-    private List<String> authorityList;
+    @EntityField(name = "common.reportauthoritylist", type = ApiParamType.JSONARRAY)
+    private List<String> reportAuthorityList = new ArrayList<>();
+
+    @EntityField(name = "common.viewauthoritylist", type = ApiParamType.JSONARRAY)
+    private List<String> viewAuthorityList = new ArrayList<>();
 
     @EntityField(name = "term.itsm.channeltypeuuid", type = ApiParamType.STRING)
     private String channelTypeUuid;
@@ -101,8 +102,6 @@ public class ChannelVo extends BasePageVo {
     @JSONField(serialize = false)
     private boolean isAuthority = false;
     @JSONField(serialize = false)
-    private List<AuthorityVo> authorityVoList;
-    @JSONField(serialize = false)
     private CatalogVo parent;
     @JSONField(serialize = false)
     private Integer sort;
@@ -282,41 +281,20 @@ public class ChannelVo extends BasePageVo {
         this.sla = sla;
     }
 
-    public List<String> getAuthorityList() {
-        if (authorityList == null && CollectionUtils.isNotEmpty(authorityVoList)) {
-            authorityList = new ArrayList<>();
-            for (AuthorityVo authorityVo : authorityVoList) {
-                GroupSearch groupSearch = GroupSearch.getGroupSearch(authorityVo.getType());
-                if (groupSearch != null) {
-                    authorityList.add(groupSearch.getValuePlugin() + authorityVo.getUuid());
-                }
-            }
-        }
-        return authorityList;
+    public List<String> getReportAuthorityList() {
+        return reportAuthorityList;
     }
 
-    public void setAuthorityList(List<String> authorityList) {
-        this.authorityList = authorityList;
+    public void setReportAuthorityList(List<String> reportAuthorityList) {
+        this.reportAuthorityList = reportAuthorityList;
     }
 
-    public List<AuthorityVo> getAuthorityVoList() {
-        if (authorityVoList == null && CollectionUtils.isNotEmpty(authorityList)) {
-            authorityVoList = new ArrayList<>();
-            for (String authority : authorityList) {
-                String[] split = authority.split("#");
-                if (GroupSearch.getGroupSearch(split[0]) != null) {
-                    AuthorityVo authorityVo = new AuthorityVo();
-                    authorityVo.setType(split[0]);
-                    authorityVo.setUuid(split[1]);
-                    authorityVoList.add(authorityVo);
-                }
-            }
-        }
-        return authorityVoList;
+    public List<String> getViewAuthorityList() {
+        return viewAuthorityList;
     }
 
-    public void setAuthorityVoList(List<AuthorityVo> authorityVoList) {
-        this.authorityVoList = authorityVoList;
+    public void setViewAuthorityList(List<String> viewAuthorityList) {
+        this.viewAuthorityList = viewAuthorityList;
     }
 
     public String getChannelTypeUuid() {
-- 
Gitee