From c0e8ed3bdea63415128227f88ec26cb0e508c842 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Thu, 28 Nov 2019 20:21:53 +0800
Subject: [PATCH] =?UTF-8?q?app=5Fmenu=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5n?=
 =?UTF-8?q?um=5Fflag=E3=80=81=E5=AE=8C=E5=96=84=E9=A6=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/AppMenuDTO.java     | 17 ++++++-----------
 .../epdc/result/EpdcAppChildNavResultDTO.java   |  5 +++++
 .../elink/esua/epdc/entity/AppMenuEntity.java   | 15 +++++----------
 .../src/main/resources/mapper/AppMenuDao.xml    |  4 +++-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
index 43fa41208..210ca1665 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java
@@ -55,11 +55,6 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
     @NotNull(message = "{sysmenu.pid.require}", groups = DefaultGroup.class)
     private Long pid;
 
-    /**
-     * 菜单URL
-     */
-    private String url;
-
     /**
      * 类型   0：菜单   1：按钮
      */
@@ -71,11 +66,6 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
      */
     private String icon;
 
-    /**
-     * 权限标识，如：sys:menu:save
-     */
-    private String permissions;
-
     /**
      * 样式名称
      */
@@ -130,4 +120,9 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
 
     @NotBlank(message = "{sysmenu.name.require}", groups = DefaultGroup.class)
     private String name;
-}
\ No newline at end of file
+
+    /**
+     * 是否显示数字 0否 1是
+     */
+    private String numFlag;
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java
index a08c4f74c..4414e9ac1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java
@@ -37,4 +37,9 @@ public class EpdcAppChildNavResultDTO implements Serializable {
      * 样式名称
      */
     private String className;
+
+    /**
+     * 是否显示数字 0否 1是
+     */
+    private String numFlag;
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java
index 3feffd5d9..00b42d0df 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java
@@ -52,11 +52,6 @@ public class AppMenuEntity extends BaseEntity {
     @TableField(exist = false)
     private String name;
 
-    /**
-     * 菜单URL
-     */
-    private String url;
-
     /**
      * 类型   0：菜单   1：按钮
      */
@@ -67,11 +62,6 @@ public class AppMenuEntity extends BaseEntity {
      */
     private String icon;
 
-    /**
-     * 权限标识，如：sys:menu:save
-     */
-    private String permissions;
-
     /**
      * 样式名称
      */
@@ -121,4 +111,9 @@ public class AppMenuEntity extends BaseEntity {
      */
     private String templateId;
 
+    /**
+     * 是否显示数字 0否 1是
+     */
+    private String numFlag;
+
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
index dbd3ab9f0..ee61a0323 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
@@ -83,6 +83,7 @@
             <result column="remark" property="remark"/>
             <result column="icon" property="icon"/>
             <result column="className" property="className"/>
+            <result column="numFlag" property="numFlag"/>
         </collection>
     </resultMap>
 
@@ -98,7 +99,8 @@
             mc.menu_code AS navCode,
             mc.class_name AS className,
             mc.remark,
-            mc.icon
+            mc.icon,
+            mc.num_flag as numFlag
         FROM
             sys_app_menu mp
             LEFT JOIN sys_language lp ON lp.table_id = mp.id