From 454c5e625132d6bde4cc6ba77bb9ba2d51c52ad4 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 31 Jul 2023 17:32:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8E=9F=E5=A7=8B=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/core/service/CoreUserService.java      | 12 ++++++++++++
 .../main/java/com/ibeetl/jlw/dao/StudentDao.java |  7 +++++++
 .../service/api/student/ApiStudentService.java   | 12 ++++++++----
 web/src/main/resources/sql/jlw/student.md        | 16 ++++++++++++++++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java
index cfc06409..79649f01 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java
@@ -176,6 +176,18 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 		return coreUserDao.updateTemplateById(entity) > 0;
 	}
 
+	/**
+	 * 验证-不需要验证旧密码
+	 * @return
+	 */
+	public Boolean editPwdByOldNotVerify(@NotBlank(message = "新密码不能为空！") String newPwd,
+								@NotNull(message = "用户ID不能为空！") Long userId) {
+		CoreUser entity = new CoreUser();
+		entity.setId(userId);
+		entity.setPassword(newPwd);
+		return coreUserDao.updateTemplateById(entity) > 0;
+	}
+
 
 	/**
 	 * 根据用户ID更新用户登录的信息
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
index 090f2963..811da661 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
@@ -105,6 +105,13 @@ public interface StudentDao extends BaseMapper<Student>{
      */
     Student getStudentByStudentEditPasswordDTO(StudentEditPasswordDTO dto);
 
+    /**
+     * 学生端-修改密码，数据库验证，不校验原始密码
+     * @param dto
+     * @return
+     */
+    Student getStudentByStudentEditPasswordNotVerifyDTO(StudentEditPasswordDTO dto);
+
     StudentActiveInfo studentActiveInfo(Long studentId, Long userId);
 
 }
\ No newline at end of file
diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java
index 83d6d385..ca5cd49e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java
@@ -193,7 +193,7 @@ public class ApiStudentService {
 
         // 密码遵循加密算法
         dto.setNewPwd(passwordEncryptService.password(dto.getNewPwd()));
-        dto.setOldPwd(passwordEncryptService.password(dto.getOldPwd()));
+//        dto.setOldPwd(passwordEncryptService.password(dto.getOldPwd()));
 
         // 传入的院校ID
         final Long universitiesCollegesId = dto.getUniversitiesCollegesId();
@@ -212,11 +212,15 @@ public class ApiStudentService {
             Assert.isTrue(studentDao.templateCount(entity) > 0, "学生姓名不存在！");
         }
 
-        Student studentInfo = studentDao.getStudentByStudentEditPasswordDTO(dto);
-        Assert.notNull(studentInfo, "原始密码错误！");
+//        Student studentInfo = studentDao.getStudentByStudentEditPasswordDTO(dto);
+//        Assert.notNull(studentInfo, "原始密码错误！");
+
+        Student studentInfo = studentDao.getStudentByStudentEditPasswordNotVerifyDTO(dto);
+        Assert.notNull(studentInfo, "未查询到学生");
 
         // 根据旧密码修改新密码
-        Boolean updateSuccess = coreUserService.editPwdByOld(dto.getOldPwd(), dto.getNewPwd(), studentInfo.getUserId());
+//        Boolean updateSuccess = coreUserService.editPwdByOld(dto.getOldPwd(), dto.getNewPwd(), studentInfo.getUserId());
+        Boolean updateSuccess = coreUserService.editPwdByOldNotVerify( dto.getNewPwd(), studentInfo.getUserId());
         Assert.isTrue(updateSuccess, "密码修改失败！");
     }
 
diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md
index eae86458..21540e9e 100644
--- a/web/src/main/resources/sql/jlw/student.md
+++ b/web/src/main/resources/sql/jlw/student.md
@@ -1478,6 +1478,22 @@ getStudentByStudentEditPasswordDTO
   AND t.student_sn = #studentSn#
   AND ta.PASSWORD = #oldPwd#
 
+getStudentByStudentEditPasswordNotVerifyDTO
+===
+* 学生端-修改密码 验证信息
+
+  SELECT
+  t.*
+  FROM
+  student t
+  LEFT JOIN core_user ta ON ta.ID = t.user_id
+  WHERE
+  1 = 1
+  AND t.student_status = 1
+  AND ta.STATE = 'S1'
+  AND ta.DEL_FLAG = 0
+  AND t.student_name = #studentName#
+  AND t.student_sn = #studentSn#
 
 studentActiveInfo
 ===