Explorar el Código

1、增加用户信息返回

rayson hace 8 meses
padre
commit
c0f7858dcc

+ 1 - 1
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/util/LoginUserContext.java

@@ -132,7 +132,7 @@ public class LoginUserContext {
 
 
     /**
-     * 效验当前是不是用户企业信息,不是就抛出异常
+     * 效验当前是不是用户企业信息,不是就返回false
      **/
     public static boolean checkIsEnterpriseUserRetBool() {
         LoginUser loginUser = LoginUserContext.get();

+ 17 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/api/user/UserInfoRespDTO.java

@@ -24,6 +24,23 @@ public class UserInfoRespDTO {
 
     // ========== 用户信息 ==========
 
+    @Schema(description = "手机号码")
+    private String phone;
+
+    @Schema(description = "vip标识")
+    private String vipFlag;
+
+    @Schema(description = "vip过期时间")
+    private LocalDateTime vipExpireDate;
+
+    @Schema(description = "最后登录IP")
+    private String loginIp;
+
+    @Schema(description = "最后登录时间")
+    private LocalDateTime loginDate;
+
+    // ========== 人才信息 ==========
+
     @Schema(description = "用户id", example = "23317")
     private Long userId;
 

+ 14 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/api/user/UserApiImpl.java

@@ -2,8 +2,10 @@ package com.citu.module.menduner.system.api.user;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
+import com.citu.module.menduner.system.dal.mysql.user.MdeUserMapper;
 import com.citu.module.menduner.system.enums.user.MdeUserTypeEnum;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +22,9 @@ public class UserApiImpl implements UserApi {
     @Resource
     private PersonInfoMapper personMapper;
 
+    @Resource
+    private MdeUserMapper userMapper;
+
     @Resource
     private EnterpriseUserBindMapper bindMapper;
 
@@ -38,6 +43,14 @@ public class UserApiImpl implements UserApi {
                     respDTO.setName(personInfo.getName());
                     respDTO.setSex(personInfo.getSex());
                 }
+                MdeUserDO user = userMapper.selectOne(MdeUserDO::getId, dto.getUserId());
+                if(null!= user) {
+                    respDTO.setPhone(user.getPhone());
+                    respDTO.setVipFlag(user.getVipFlag());
+                    respDTO.setVipExpireDate(user.getVipExpireDate());
+                    respDTO.setLoginIp(user.getLoginIp());
+                    respDTO.setLoginDate(user.getLoginDate());
+                }
 
             }
             if (MdeUserTypeEnum.ENTERPRISE_USER.getType() == dto.getUserType()) {
@@ -48,7 +61,7 @@ public class UserApiImpl implements UserApi {
                 }
             }
 
-            if(null!= respDTO.getUserId()) {
+            if (null != respDTO.getUserId()) {
                 list.add(respDTO);
             }