From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 19 十一月 2024 16:35:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java | 72 +++++++++++++++++++++++++++++++----- 1 files changed, 62 insertions(+), 10 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java index 09b7139..35aa1ce 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java @@ -3,6 +3,7 @@ import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -27,7 +28,7 @@ /** * 瀛愬瓩鑺傜偣 */ - private List<MenuVO> children; + private List<MenuVO> children = new ArrayList<>(); /** * 鏄惁鏈夊瓙瀛欒妭鐐� @@ -80,7 +81,7 @@ private Integer sort; /** - * 鑿滃崟绫诲瀷 + * 鑿滃崟绫诲瀷: 0锛氳彍鍗曪紝1锛氭寜閽� */ private Integer category; @@ -125,6 +126,11 @@ private String modeType; /** + * 鍔熻兘绫诲瀷锛�0锛氬姛鑳借彍鍗曡妭鐐癸紝1锛氬垎绫�,3锛氭寜閽� + */ + private int functionType; + + /** * 鏄ā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣� */ private Integer childType; @@ -135,9 +141,63 @@ private Boolean isValid; /** + * 鍚堝苟浜唂unctionOperate瀵硅薄涓殑灞炴�х殑妯″潡鐨刬d + */ + private String funcId; + + /** + * 妯″潡涓嬪叧鑱旂殑鎿嶄綔绫诲瀷id + */ + private String operId; + /** + * 鏄惁鏈夋潈闄愶紝0娌℃湁锛�1鏈� + */ + private Integer havePermission; + + /** * 鍓嶇鏄惁闅愯棌 */ private HashMap<String,Boolean> meta = new HashMap<>(); + + public void setFuncId(String funcId) { + this.funcId = funcId; + } + + public void setOperId(String operId) { + this.operId = operId; + } + + public String getFuncId() { + return funcId; + } + + public void setFunctionType(int functionType) { + this.functionType = functionType; + } + + public void setValid(Boolean valid) { + isValid = valid; + } + + public void setHavePermission(Integer havePermission) { + this.havePermission = havePermission; + } + + public int getFunctionType() { + return functionType; + } + + public Boolean getValid() { + return isValid; + } + + public Integer getHavePermission() { + return havePermission; + } + + public String getOperId() { + return operId; + } public void setPathC(String pathC) { this.pathC = pathC; @@ -151,10 +211,6 @@ this.resourceMobile = resourceMobile; } - public void setValid(Boolean valid) { - isValid = valid; - } - public String getPathC() { return pathC; } @@ -165,10 +221,6 @@ public String getResourceMobile() { return resourceMobile; - } - - public Boolean getValid() { - return isValid; } public void setIsValid(Boolean isValid) { -- Gitblit v1.9.3