From ad0b0583389caa82afb55d5f217147fb0e70fe84 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Nov 2021 17:36:59 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 133d87d..571d201 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
@@ -321,6 +321,12 @@
         authorityManager.initUserPower(res, hasBind);
 
         UserInfoVo userInfoVo = new UserInfoVo();
+        if(hasBind.getShopId()!=null){
+            SysShopInfo shopInfo = sysShopInfoService.findById(hasBind.getShopId());
+            hasBind.setShopName(shopInfo.getShopName());
+            userInfoVo.setShopName(shopInfo.getShopShortName());
+        }
+
         userInfoVo.setId(hasBind.getSuId());
         userInfoVo.setName(hasBind.getSuName());
         userInfoVo.setRoleName(hasBind.getRoleName());
@@ -347,6 +353,12 @@
         authorityManager.initUserPower(result, user);
 
         UserInfoVo userInfoVo = new UserInfoVo();
+        if(user.getShopId()!=null){
+            SysShopInfo shopInfo = sysShopInfoService.findById(user.getShopId());
+            user.setShopName(shopInfo.getShopName());
+            userInfoVo.setShopName(shopInfo.getShopShortName());
+        }
+
         userInfoVo.setId(user.getSuId());
         userInfoVo.setName(user.getSuName());
         userInfoVo.setRoleName(user.getRoleName());

--
Gitblit v1.9.1