From abeab7ca1ca8ccbb01ec9fd52812193092acaa44 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 16 Nov 2017 17:37:56 +0800
Subject: [PATCH] merge

---
 .../java/com/xwbing/controller/sys/SysAuthorityControl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
index 43cf1a1..32a3529 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
@@ -112,7 +112,7 @@ public class SysAuthorityControl {
     @ApiOperation(value = "递归查询所有权限")
     @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string")
     public JSONObject listTree(String enable) {
-        List<SysAuthVo> authoritys = null;
+        List<SysAuthVo> authoritys;
         //先去缓存里拿
         boolean exists = redisService.exists(CommonConstant.AUTHORITY_THREE);
         if (exists) {