From dfbe1facef9b06801532c22ba8f80d3414368671 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 21 Jul 2022 10:10:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  |  2 +-
 .../system/controller/LoginController.java    | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 50c20abe..e35e85e8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -959,7 +959,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
         } else {
             //只有会议负责人，会议联系人，参会人可以修改
-            if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
+            if (!b && !directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
                 throw new JeroBootException("只有会议负责人，会议联系人，参会人可以修改");
             }
         }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
index dfa213f1..9834dfc1 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
@@ -136,20 +136,20 @@ public class LoginController {
             return result;
         }
         //2. 校验用户名或密码是否正确
-        //String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
-        //String syspassword = sysUser.getPassword();
-        //if (!syspassword.equals(userpassword)) {
-        //    // 重试登录次数加一
-        //    retryCount++;
-        //    if (retryCount == 1) {
-        //        redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
-        //    } else {
-        //        redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
-        //    }
-        //    String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
-        //    result.error500(msg);
-        //    return result;
-        //}
+        String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
+        String syspassword = sysUser.getPassword();
+        if (!syspassword.equals(userpassword)) {
+            // 重试登录次数加一
+            retryCount++;
+            if (retryCount == 1) {
+                redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
+            } else {
+                redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
+            }
+            String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
+            result.error500(msg);
+            return result;
+        }
         //登录成功，清除错误登录次数
         redisUtil.del(RETRY_LOGIN_PREFIX + username);
         //如果用初始密码登录，前端就跳转到修改密码界面