From 68cdcf299d226412f50da6f427069b7a67a66b0b Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Tue, 28 May 2019 14:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug;=20demo=20redis=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AF=B9=E8=B1=A1=E6=9C=AA?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 2 +-
 .../src/main/java/org/jeecg/config/ShiroConfig.java         | 2 ++
 .../java/org/jeecg/modules/demo/test/entity/JeecgDemo.java  | 6 ++++--
 .../system/service/impl/SysPermissionServiceImpl.java       | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 715f0144..f72a1b69 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 
 - 依赖管理：Maven
 
-- 数据库：MySQL5.0+  &  Oracle 11g & Sqlserver2008
+- 数据库：MySQL5.0  &  Oracle 11g & Sqlserver2005
 
 - 缓存：Redis
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
index 02bda261..3bd46479 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
@@ -68,6 +68,8 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/actuator/metrics/**", "anon");
 		filterChainDefinitionMap.put("/actuator/httptrace/**", "anon");
 		filterChainDefinitionMap.put("/actuator/redis/**", "anon");
+		filterChainDefinitionMap.put("/test/jeecgDemo/demo3", "anon"); //模板测试
+		filterChainDefinitionMap.put("/test/jeecgDemo/redisDemo/**", "anon"); //redis测试
 		
 		
 		// 添加自己的过滤器并且取名为jwt
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
index 0dde6d04..35cb6b97 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
@@ -1,5 +1,7 @@
 package org.jeecg.modules.demo.test.entity;
 
+import java.io.Serializable;
+
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -24,8 +26,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ApiModel(value="测试DEMO对象", description="测试DEMO")
 @TableName("demo")
-public class JeecgDemo extends JeecgEntity {
-
+public class JeecgDemo extends JeecgEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
 	/** 部门编码 */
 	@Excel(name="部门编码",width=25)
 	@ApiModelProperty(value = "部门编码")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
index 6dcd11c0..dde89804 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
@@ -166,7 +166,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 				//b.判断老的菜单下是否还有其他子菜单，没有的话则设置为叶子节点
 				int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
 				if(cc==0) {
-					this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
+					if(oConvertUtils.isNotEmpty(p.getParentId())) {
+						this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
+					}
 				}
 				
 			}
-- 
GitLab