禅道#633问题修复

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
@@ -140,7 +140,10 @@ public class OrganSecurityWebFilter extends ApiRequestFilter {
ServiceException serviceException = (ServiceException) ex;
if (Objects.equals(serviceException.getCode(), ErrorCodeConstants.ORGAN_EXPIRE.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());
}
}
@@ -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.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;
@@ -80,6 +81,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
private SmsCodeApi smsCodeApi;
@Resource
private OrganService organService;
@Resource
private DeptService deptService;
@Resource
private SmsCodeService smsCodeService;
@@ -107,6 +110,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
}
// 校验机构有效性
organService.validOrgan(user.getOrganId());
// 校验部门有效性
deptService.validDept(user.getDeptId());
// 校验密码
if (!userService.isPasswordMatch(password, user.getPassword())) {
createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);