diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/AuthController.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/AuthController.java index 559281eb..9108bf8f 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/AuthController.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/auth/AuthController.java @@ -82,25 +82,25 @@ public class AuthController { @Operation(summary = "使用账号密码登录") @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 public CommonResult login(@RequestBody @Valid AuthLoginReqVO reqVO) { -// if (ObjectUtil.isNotEmpty(reqVO.getUsername())&&!"admin".equals(reqVO.getUsername())){ -// AdminUserDO adminUserDO = userService.getOne(); -// if (ObjectUtil.isEmpty(adminUserDO)){ -// LocalDateTime currentDate = LocalDateTime.now(); -// LocalDateTime targetDate = LocalDateTime.of(2025, 12, 17,0,0,0); -// if (currentDate.isAfter(targetDate)) { -// return error(400,"当前账号已经过期,不允许使用"); -// } -// }else{ -// if ("1".equals(adminUserDO.getMobile())){ -// if (ObjectUtil.isNotEmpty(adminUserDO.getCreateTime())){ -// LocalDateTime currentDate = LocalDateTime.now(); -// if (currentDate.isAfter(adminUserDO.getCreateTime())){ -// return error(400,"当前账号已经过期,不允许使用"); -// } -// } -// } -// } -// } + if (ObjectUtil.isNotEmpty(reqVO.getUsername())){ + AdminUserDO adminUserDO = userService.getOne(); + if (ObjectUtil.isEmpty(adminUserDO)){ + LocalDateTime currentDate = LocalDateTime.now(); + LocalDateTime targetDate = LocalDateTime.of(2025, 12, 17,0,0,0); + if (currentDate.isAfter(targetDate)) { + return error(400,"当前账号已经过期,不允许使用"); + } + }else{ + if ("1".equals(adminUserDO.getMobile())){ + if (ObjectUtil.isNotEmpty(adminUserDO.getCreateTime())){ + LocalDateTime currentDate = LocalDateTime.now(); + if (currentDate.isAfter(adminUserDO.getCreateTime())){ + return error(400,"当前账号已经过期,不允许使用"); + } + } + } + } + } return success(authService.login(reqVO)); }