diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java index 54331aaea..ce2784489 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.czg.account.dto.SysLoginDTO; import com.czg.account.entity.ShopInfo; +import com.czg.account.entity.SysUser; import com.czg.account.service.*; import com.czg.account.vo.LoginVO; import com.czg.annotation.SaAdminCheckPermission; @@ -35,11 +36,9 @@ public class AuthorizationController { @Resource private AuthorizationService authorizationService; @Resource - private PermissionService permissionService; - @Resource private ShopInfoService shopInfoService; @Resource - private ShopStaffService shopStaffService; + private SysUserService sysUserService; /** @@ -105,14 +104,11 @@ public class AuthorizationController { */ @GetMapping("/userInfo") public CzgResult> getUserInfo() { - String account = StpKit.USER.getAccount(); ShopInfo shopInfo = shopInfoService.queryChain() .select(ShopInfo::getId, ShopInfo::getShopName) .eq(ShopInfo::getId, StpKit.USER.getShopId()).one(); - if (account.contains("@")) { - account = account.split("@")[1]; - } - Map map = Map.of("shopId", shopInfo.getId(), "shopName", shopInfo.getShopName(), "account", account); + SysUser one = sysUserService.queryChain().eq(SysUser::getId, StpKit.USER.getShopId()).one(); + Map map = Map.of("shopId", shopInfo.getId(), "shopName", shopInfo.getShopName(), "account", one.getAccount()); return CzgResult.success(map); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java deleted file mode 100644 index 0d1d2a031..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.czg.account.service; - -/** - * @author Administrator - */ -public interface PermissionService { -} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java deleted file mode 100644 index 57cdc0287..000000000 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.czg.service.account.service.impl; - -import com.czg.account.service.PermissionService; -import org.springframework.stereotype.Service; - -/** - * @author zs - */ -@Service -public class PermissionServiceImpl implements PermissionService { -}