diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/train/trainList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/train/trainList.html index b3996577..30f3c1e4 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/train/trainList.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/train/trainList.html @@ -42,7 +42,7 @@ </div> <th:block th:include="include :: footer" /> <script th:inline="javascript"> - var detailFlag = [[${@permission.hasPermi('system:apply:edit')}]] + var detailFlag = [[${@permission.hasPermi('system:train:edit')}]] var prefix = ctx + "system/train"; $(function() { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java index fcfab2c8..a93912cb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java @@ -109,14 +109,6 @@ public class SysLoginService { throw new UserDeleteException(); } - /** - * 用户审核状态检测 - */ - if (!ExamineState.ENABLE.getCode().equals(user.getExamine())) { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.examine.disabled"))); - throw new UserDisableException(); - } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark()))); throw new UserBlockedException();