Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道#633问题修复

Browse Source
This commit is contained in:
gaoqr
2025-03-10 15:41:29 +08:00
parent 1fe749b904
commit 0f5c00281c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-spring-boot-starter-biz-organ/src/main/java/com/cf/imes/framework/organ/core/security/OrganSecurityWebFilter.java
+4 -1
View File
@@ -140,7 +140,10 @@ public class OrganSecurityWebFilter extends ApiRequestFilter {
ServiceException serviceException = (ServiceException) ex; ServiceException serviceException = (ServiceException) ex;
if (Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_EXPIRE.getCode()) if (Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_EXPIRE.getCode())
|| Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_DISABLE.getCode()) || Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_DISABLE.getCode())
|| Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_NOT_EXISTS.getCode())) { || Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_NOT_EXISTS.getCode())
|| Objects.equals(serviceException.getCode(), ErrorCodeConstants.DEPT_DISABLE.getCode())
|| Objects.equals(serviceException.getCode(), ErrorCodeConstants.DEPT_NOT_FOUND.getCode())
|| Objects.equals(serviceException.getCode(), ErrorCodeConstants.DEPT_PARENT_NOT_EXITS.getCode())) {
result.setCode(GlobalErrorCodeConstants.UNAUTHORIZED.getCode()); result.setCode(GlobalErrorCodeConstants.UNAUTHORIZED.getCode());
} }
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java
+5
View File
@@ -26,6 +26,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.logger.LoginResultEnum;
import com.cf.imes.module.system.enums.oauth2.OAuth2ClientConstants; import com.cf.imes.module.system.enums.oauth2.OAuth2ClientConstants;
import com.cf.imes.module.system.enums.sms.SmsSceneEnum; 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.logger.LoginLogService;
import com.cf.imes.module.system.service.member.MemberService; import com.cf.imes.module.system.service.member.MemberService;
import com.cf.imes.module.system.service.oauth2.OAuth2TokenService; import com.cf.imes.module.system.service.oauth2.OAuth2TokenService;
@@ -80,6 +81,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
private SmsCodeApi smsCodeApi; private SmsCodeApi smsCodeApi;
@Resource @Resource
private OrganService organService; private OrganService organService;
@Resource
private DeptService deptService;
@Resource @Resource
private SmsCodeService smsCodeService; private SmsCodeService smsCodeService;
@@ -107,6 +110,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
} }
// 校验机构有效性 // 校验机构有效性
organService.validOrgan(user.getOrganId()); organService.validOrgan(user.getOrganId());
// 校验部门有效性
deptService.validDept(user.getDeptId());
// 校验密码 // 校验密码
if (!userService.isPasswordMatch(password, user.getPassword())) { if (!userService.isPasswordMatch(password, user.getPassword())) {
createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS); createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);