From 5f338c27f108d70ac449ef36ea27c5cf52914e25 Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Tue, 28 May 2019 14:39:22 +0800
Subject: [PATCH] 解决bug; demo redis测试功能，对象未序列号
---
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java | 2 ++
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java | 6 ++++--
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
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 02bda26..3bd4647 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 0dde6d0..35cb6b9 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 6dcd11c..dde8980 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);
+ }
}
}
--
libgit2 0.22.2