From 3895cf9707f3e0fa7eecd6f5d0ee056d498a020b Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 30 Jul 2025 09:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=81=A2=E5=A4=8D=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/auth/AdminAuthServiceImpl.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java
index 4fb384db8..207479e7a 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java
@@ -12,8 +12,6 @@ import com.cf.imes.framework.common.util.servlet.ServletUtils;
 import com.cf.imes.framework.common.util.validation.ValidationUtils;
 import com.cf.imes.framework.ip.core.service.IPQueryService;
 import com.cf.imes.framework.ip.core.service.dto.IPQueryDataRespDTO;
-import com.cf.imes.framework.organ.core.context.OrganContextHolder;
-import com.cf.imes.framework.organ.core.service.OrganFrameworkService;
 import com.cf.imes.module.system.api.logger.dto.LoginLogCreateReqDTO;
 import com.cf.imes.module.system.api.sms.SmsCodeApi;
 import com.cf.imes.module.system.api.social.dto.SocialUserRespDTO;
@@ -31,6 +29,7 @@ import com.cf.imes.module.system.enums.logger.LoginLogTypeEnum;
 import com.cf.imes.module.system.enums.logger.LoginResultEnum;
 import com.cf.imes.module.system.enums.oauth2.OAuth2ClientConstants;
 import com.cf.imes.module.system.enums.sms.SmsSceneEnum;
+import com.cf.imes.module.system.service.dept.DeptService;
 import com.cf.imes.module.system.service.logger.LoginLogService;
 import com.cf.imes.module.system.service.member.MemberService;
 import com.cf.imes.module.system.service.oauth2.OAuth2TokenService;
@@ -86,7 +85,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     @Resource
     private OrganService organService;
     @Resource
-    private OrganFrameworkService organFrameworkService;
+    private DeptService deptService;
 
     @Resource
     private SmsCodeService smsCodeService;
@@ -123,10 +122,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         }
         Long organId = user.getOrganId();
         // 校验机构有效性
-        organFrameworkService.validOrgan(organId);
+        organService.validOrgan(organId);
         // 校验部门有效性
-        OrganContextHolder.setOrganId(organId);
-        organFrameworkService.validDept(user.getDeptId());
+        deptService.validUserLoginDept(user.getDeptId());
         // 校验密码
         if (!userService.isPasswordMatch(password, user.getPassword())) {
             createLoginLog(user.getId(), username, organId, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);