Merge remote-tracking branch 'origin/lixuetao' into lixuetao

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 -> {
+                   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);

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;
     }

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;
     }

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 -->