From ec98b27bbb70ef195f789be5aa44af38c546c6cb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 14:04:16 +0800
Subject: [PATCH] 1
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 4 ++--
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java | 7 +++++--
pom.xml | 2 +-
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/management/MgtCompanyController.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BeanUtils.java | 3 ++-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd52fd4..e6775b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<springdoc.version>1.6.9</springdoc.version>
<transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
<mybatis-plus.version>3.5.4</mybatis-plus.version>
- <hutool.version>5.0.3</hutool.version>
+ <hutool.version>5.7.17</hutool.version>
<!-- override dependency version -->
<tomcat.version>9.0.96</tomcat.version>
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 14f6ea9..a07dc6e 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -148,8 +148,8 @@
String token = IdUtils.fastUUID();
AppUser appUser = new AppUser();
appUser.setUserId(user.getUserId());
- appUser.setAccountName(appUser.getAccountName());
- appUser.setPhone(appUser.getPhone());
+ appUser.setAccountName(user.getAccountName());
+ appUser.setPhone(user.getPhone());
appUser.setLoginTime(System.currentTimeMillis());
appUser.setToken(token);
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BeanUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BeanUtils.java
index 5f5efd4..10d79e6 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BeanUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/page/BeanUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.core.page;
+
import cn.hutool.core.bean.BeanUtil;
import java.util.List;
@@ -47,7 +48,7 @@
if (list == null || list.size() == 0) {
return CollUtils.emptyList();
}
- return copyList(list, clazz);
+ return copyToList(list, clazz);
}
public static <R, T> List<T> copyList(List<R> list, Class<T> clazz, Convert<R, T> convert) {
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 3726867..0160c77 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
@@ -6,8 +6,10 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.company.api.domain.User;
+import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.model.RegisterUser;
import com.ruoyi.company.api.model.UserDetail;
+import com.ruoyi.company.service.CompanyService;
import com.ruoyi.company.service.UserService;
import com.ruoyi.system.api.model.AppUser;
import io.swagger.v3.oas.annotations.Operation;
@@ -23,10 +25,11 @@
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class UserController {
private final UserService userService;
+ private final CompanyService companyService;
@PostMapping("/register")
- public R register(@RequestBody RegisterUser registerUser) {
- userService.register(registerUser);
+ public R register(@RequestBody MgtCompanyDTO mgtCompanyDTO) {
+ companyService.saveCompany(mgtCompanyDTO);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/management/MgtCompanyController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/management/MgtCompanyController.java
index 0faf2cf..dc8925a 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/management/MgtCompanyController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/management/MgtCompanyController.java
@@ -37,7 +37,7 @@
@Operation(summary = "获取企业列表")
@PostMapping("/page")
- public R<PageDTO<MgtCompanyVO>> queryPage(MgtCompanyQuery query) {
+ public R<PageDTO<MgtCompanyVO>> queryPage(@RequestBody MgtCompanyQuery query) {
return R.ok(companyService.queryPage(query));
}
@Operation(summary = "获取企业详情")
--
Gitblit v1.7.1