From 95c2121f343683f8f7514d95b7cce56b412a4b3c Mon Sep 17 00:00:00 2001
From: mikedream <mayq0518@163.com>
Date: Sat, 16 Sep 2017 15:53:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20=E4=BF=AE=E5=A4=8D=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsh/action/basic/FunctionsAction.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jsh/action/basic/FunctionsAction.java b/src/main/java/com/jsh/action/basic/FunctionsAction.java
index 1cdbedce..d35ba2a5 100644
--- a/src/main/java/com/jsh/action/basic/FunctionsAction.java
+++ b/src/main/java/com/jsh/action/basic/FunctionsAction.java
@@ -559,7 +559,14 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
 									 dataArray1.add(item1);
 									 item.put("children", dataArray1);  
 							     }
-						      }
+								 else
+								 {
+									 //不是目录，有链接
+									 item1.put("text", "<a onclick=\"NewTab('"+functions1.getName()+"','"+functions1.getURL()+"','"+functions1.getId()+"')\">"+functions1.getName()+"</a>");
+								 }
+								  dataArray1.add(item1);
+								  item.put("children", dataArray1);
+							  }
 						  }
 			              else
 			              {

From 83c28e53e86d5f177b8d23b3b69db62257ee97c6 Mon Sep 17 00:00:00 2001
From: mikedream <mayq0518@163.com>
Date: Sat, 16 Sep 2017 17:13:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsh/action/basic/FunctionsAction.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/com/jsh/action/basic/FunctionsAction.java b/src/main/java/com/jsh/action/basic/FunctionsAction.java
index d35ba2a5..ff4195e3 100644
--- a/src/main/java/com/jsh/action/basic/FunctionsAction.java
+++ b/src/main/java/com/jsh/action/basic/FunctionsAction.java
@@ -555,9 +555,6 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
 							            	  //不是目录，有链接
 							            	  item1.put("text", "<a onclick=\"NewTab('"+functions1.getName()+"','"+functions1.getURL()+"','"+functions1.getId()+"')\">"+functions1.getName()+"</a>");
 							              }
-								     
-									 dataArray1.add(item1);
-									 item.put("children", dataArray1);  
 							     }
 								 else
 								 {