From 992f5853fb625be015fa28e9a0154278b2ed41a2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jan 2021 16:54:18 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 8417f23..4fb6a84 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -125,6 +125,7 @@
query.setCompanyId(sysUsers.getCompanyId());
query.setShopId(sysUsers.getShopId());
}
+ query.setSuUserType("employee");
query.setSuName(usersQueryDto.getQueryKey());
List<SysUsers> list = sysUsersService.findByModel(query);
List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list);
@@ -159,7 +160,8 @@
})
@GetMapping(value = "/findUserInfo")
public AjaxResult findUserInfo() {
- SysUsers user = getMe();
+ SysUsers user = sysUsersService.findById(getMe().getSuId());
+
UserInfoDetailVo userInfoDetailVo = SysUsersMapper.INSTANCE.usersToDetailInfoVo(user);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
ajaxResult.putInMap("detail", userInfoDetailVo);
--
Gitblit v1.9.1