Merge remote-tracking branch 'origin/ln_ry20250512' into ln_ry20250512

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() {

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();