From a5e11115d38746b9703686def7f0640f97711585 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Tue, 16 May 2023 15:10:12 +0800
Subject: [PATCH] =?UTF-8?q?ci:menu=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=BA=94=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/sys/controller/MenuEOController.java    |  7 ++++---
 .../main/java/com/adc/da/sys/entity/MenuEO.java    | 13 +++++++++++++
 .../src/main/java/com/adc/da/sys/vo/MenuVO.java    | 14 ++++++++++++++
 .../mybatis/mapper/sys/mysql/MenuEOMapper.xml      |  3 ++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java
index 284b9e6..1b63841 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java
@@ -160,20 +160,21 @@ public class MenuEOController extends BaseController<MenuEO> {
             RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId);
             if ("管理员".equals(roleEO.getName())) {
                menuVOs.forEach(menuVO -> {
-                   menuVO.setBelong(IsBelongEnum.BELONG.getValue());
+                   if (!"1".equals(menuVO.getIsButton())) {
+                       menuVO.setBelong(IsBelongEnum.BELONG.getValue());
+                   }
                });
             }else{
                 List<RoleMenuEO> roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage);
                 for (MenuVO menuVO : menuVOs) {
                     for (RoleMenuEO roleMenuEO : roleMenuEOList){
-                        if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){
+                        if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){
                             menuVO.setBelong(IsBelongEnum.BELONG.getValue());
                             break;
                         }
                     }
                 }
             }
-
         }
 
         //List<MenuVO> levelMenus = menuEOService.changeMenu(menuVOs);
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java
index 3a5bfd5..e3a4901 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java
@@ -79,6 +79,19 @@ public class MenuEO extends TreeEntity implements Serializable {
      */
     private String isUrl;
 
+    /**
+     * 1代表是按钮
+     */
+    private String isButton;
+
+    public String getIsButton() {
+        return isButton;
+    }
+
+    public void setIsButton(String isButton) {
+        this.isButton = isButton;
+    }
+
     public String getIsUrl() {
         return isUrl;
     }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java
index 91664a4..3ab7680 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java
@@ -65,6 +65,20 @@ public class MenuVO extends TreeVO<MenuVO> {
      */
     private String isUrl;
 
+    /**
+     *
+     * @return
+     */
+    private String isButton;
+
+    public String getIsButton() {
+        return isButton;
+    }
+
+    public void setIsButton(String isButton) {
+        this.isButton = isButton;
+    }
+
     public String getIsUrl() {
         return isUrl;
     }
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml
index 01b556e..ef876cd 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml
@@ -18,11 +18,12 @@
         <result column="remarks" property="remarks"/>
         <result column="sort" property="sort"/>
         <result column="ext_info" property="extInfo" />
+        <result column="is_button" property="isButton" />
     </resultMap>
 
     <!-- TS_MENU table all fields -->
     <sql id="Base_Column_List">
-        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url
+        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button
     </sql>
 
     <!-- 用于按名称查询记录时的sql，添加前缀TS_MENU -->