From 2e3112d17b4ff529a17043d2ee4cadec78f62e14 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 16:01:20 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
index 22df23c..bd86815 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.company.api.domain.Company;
import com.ruoyi.company.api.domain.User;
import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.model.RegisterUser;
@@ -35,7 +36,6 @@
private final CompanyService companyService;
private final RedisService redisService;
-
@PostMapping("/register")
public R register(@RequestBody MgtCompanyDTO mgtCompanyDTO) {
companyService.saveCompany(mgtCompanyDTO);
@@ -47,8 +47,11 @@
public R<UserDetail> getUserDetail() {
AppUser appLoginUser = SecurityUtils.getAppLoginUser();
User user = userService.getById(appLoginUser.getUserId());
+ Company company = companyService.getOne(new LambdaQueryWrapper<Company>()
+ .eq(Company::getUserId, user.getUserId()));
UserDetail userDetail = new UserDetail();
BeanUtils.copyProperties(user, userDetail);
+ BeanUtils.copyProperties(company, userDetail);
return R.ok(userDetail);
}
--
Gitblit v1.7.1