diff --git a/src/main/java/com/nis/domain/SysMenu.java b/src/main/java/com/nis/domain/SysMenu.java index 568b98b94..103effe3b 100644 --- a/src/main/java/com/nis/domain/SysMenu.java +++ b/src/main/java/com/nis/domain/SysMenu.java @@ -52,6 +52,7 @@ public class SysMenu extends BaseEntity{ private String menuBg; private Integer isTop; + private Integer functionId; private List children = new ArrayList(); @@ -270,6 +271,14 @@ public class SysMenu extends BaseEntity{ this.isTop = isTop; } + public Integer getFunctionId() { + return functionId; + } + + public void setFunctionId(Integer functionId) { + this.functionId = functionId; + } + } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.xml b/src/main/java/com/nis/web/dao/SysMenuDao.xml index e03e2d542..b884fb054 100644 --- a/src/main/java/com/nis/web/dao/SysMenuDao.xml +++ b/src/main/java/com/nis/web/dao/SysMenuDao.xml @@ -23,7 +23,8 @@ a.quick_action, a.menu_bg, p.name AS "parent.name", - a.is_top + a.is_top, + a.function_id @@ -88,7 +89,8 @@ update_date, remarks, del_flag, - is_top + is_top, + function_id ) VALUES ( #{parent.id}, #{parentIds}, @@ -106,7 +108,8 @@ #{updateDate}, #{remarks}, #{delFlag}, - #{isTop} + #{isTop}, + #{functionId} ) @@ -125,7 +128,8 @@ update_by = #{updateBy.id}, update_date = #{updateDate}, remarks = #{remarks}, - is_top = #{isTop} + is_top = #{isTop}, + function_id=#{functionId} WHERE id = #{id} diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index f017d30a7..729e1993a 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -1,10 +1,10 @@ #jdbc for oracle #jdbc.driver=oracle.jdbc.driver.OracleDriver jdbc.devlop.driver=com.mysql.jdbc.Driver -jdbc.devlop.url=jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull -jdbc.devlop.username=dfh -jdbc.devlop.key=xLtQB+Bp6joOYrVIfBdrRA== -jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg== +jdbc.devlop.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.devlop.username=root +jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q== +jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g== jdbc.product.driver=oracle.jdbc.driver.OracleDriver #jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180)))) diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp index 9a089e1bd..62b70dc5a 100644 --- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp @@ -107,6 +107,14 @@ +
+ +
+ + +
+
+