From 40582b7a5988c8a76ac92df5064d813581d7569f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 19:56:50 +0800
Subject: [PATCH] 1
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
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 a41f54d..11d5c34 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
@@ -223,14 +223,28 @@
@Operation(summary = "公司校验",description = "公司校验")
public R<?> check(@RequestBody RegisterUser registerUser)
{
- R<User> userR;
- try {
- userR = sysLoginService.resetPwdCheck(registerUser);
- } catch (Exception e) {
- return R.fail("用户不存在");
+ String accountName = registerUser.getAccountName();
+ R<User> userByPhoneR = remoteCompanyUserService.getUserByPhone(accountName, SecurityConstants.INNER);
+ if (R.isError(userByPhoneR)) {
+ throw new RuntimeException(userByPhoneR.getMsg());
}
- if (userR == null){
- return R.fail("用户不存在");
+ boolean check = false;
+ R<User> userR = new R<>();
+ if (userByPhoneR.getData() != null) {
+ check = sysLoginService.check(userByPhoneR.getData(), registerUser.getCompanyName(), registerUser.getIdCardNumber());
+ }
+ if (!check){
+ userR = remoteCompanyUserService.getUserByAccountName(accountName, SecurityConstants.INNER);
+ if (R.isError(userR)) {
+ return R.fail("账号不存在");
+ }
+ if (userR.getData() == null) {
+ return R.fail("账号不存在");
+ }
+ check = sysLoginService.check(userR.getData(), registerUser.getCompanyName(), registerUser.getIdCardNumber());
+ }
+ if (!check) {
+ return R.fail("账号不存在");
}
return R.ok();
}
--
Gitblit v1.7.1