diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
index 9fe6ae5c..86f5ad04 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
@@ -131,23 +131,23 @@ public class LoginServiceImpl implements ILoginService {
         }
 
         // 若用户名有效，则查询该账号的登陆失败次数是否符合等保要求
-        int retryCount = 0 ;
-        if ( redisUtil.get(RETRY_LOGIN_PREFIX + username) != null){
-            retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username);
-        }
-        if (retryCount >= RETRY_LOGIN_MAX_COUNT){
-            return Result.error("密码错误次数过多，请15分钟后重试");
-        }
-        //2. 校验用户名或密码是否正确
-        String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
-        String syspassword = sysUser.getPassword();
-        if (!syspassword.equals(userpassword)) {
-            // 重试登录次数加一
-            retryCount++;
-            this.setRetryInfoToRedis(username, retryCount);
-            String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount);
-            return Result.error(msg);
-        }
+//        int retryCount = 0 ;
+//        if ( redisUtil.get(RETRY_LOGIN_PREFIX + username) != null){
+//            retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username);
+//        }
+//        if (retryCount >= RETRY_LOGIN_MAX_COUNT){
+//            return Result.error("密码错误次数过多，请15分钟后重试");
+//        }
+//        //2. 校验用户名或密码是否正确
+//        String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
+//        String syspassword = sysUser.getPassword();
+//        if (!syspassword.equals(userpassword)) {
+//            // 重试登录次数加一
+//            retryCount++;
+//            this.setRetryInfoToRedis(username, retryCount);
+//            String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount);
+//            return Result.error(msg);
+//        }
         //登录成功，清除错误登录次数
         redisUtil.del(RETRY_LOGIN_PREFIX + username);
         if (checkSysPermission(username)) {
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 3c2f6097..420ea48c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -313,6 +313,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
             wrapper.orderByDesc(LawsMarketStandardDetail::getCreateTime);
             listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(wrapper);
         }
+        listLawsMarketStandardDetail = listLawsMarketStandardDetail.stream()
+                .sorted(Comparator.comparing(LawsMarketStandardDetail::getStandardNumber)).collect(Collectors.toList());
 
         // AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());