1、忘记密码，去掉原始密码校验

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更新用户登录的信息

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

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, "密码修改失败！");
     }
 

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
 ===