From e3dae73ced9ac1180a35e303c3fc3ee89ab477aa Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 16:21:56 +0800
Subject: [PATCH] 新增权限返回

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index c03a787..ec18586 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -2,10 +2,9 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.matrix.component.redis.RedisClient;
-import com.matrix.core.constance.MatrixConstance;
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.tools.UUIDUtil;
-import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.authority.AppAuthorityManager;
 import com.matrix.system.app.dto.LoginDto;
 import com.matrix.system.app.vo.UserInfoVo;
 import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -39,7 +38,7 @@
     private SysShopInfoService sysShopInfoService;
 
     @Autowired
-    private DefaultAuthorityManager authorityManager;
+    private AppAuthorityManager authorityManager;
 
     @Autowired
     private RedisClient redisClient;
@@ -75,6 +74,7 @@
         userInfoVo.setPhoto(user.getSuPhoto());
 
         AjaxResult result = AjaxResult.buildSuccessInstance("登陆成功");
+        authorityManager.initUserPower(result,user);
         result.putInMap("user", userInfoVo);
         result.putInMap("token", token);
         return result;

--
Gitblit v1.9.1