From 1cfbbe629377a6147d3415d38be3c0401e586669 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jan 2021 18:10:44 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java | 3 +++
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 3 ++-
2 files changed, 5 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..7d83f3b 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
@@ -159,7 +159,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);
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java
index 20e55fd..e7b1b39 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoDetailVo.java
@@ -1,5 +1,7 @@
package com.matrix.system.app.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +29,7 @@
@ApiModelProperty(value = "性别")
private String sex;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
@ApiModelProperty(value = "生日")
private Date birthday;
--
Gitblit v1.9.1