密码相关bug修改

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -250,7 +250,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
 
     @Override
     public boolean resetPassword(ResetPasswordDto dto) {
-        User oldUser = this.getById(StpUtil.getLoginIdAsLong());
+        User oldUser = this.getById(dto.getId());
         if (ObjectUtils.isEmpty(oldUser)) {
             throw new MyException("用户信息发生改变，刷新重试");
         }

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -688,6 +688,10 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 user = new BaseStudentUser();
                 user.setId(userId);
                 user.setUserName(credentialNumber);
+                String lastSixDigits = credentialNumber.length() <= 6
+                        ? credentialNumber
+                        : credentialNumber.substring(credentialNumber.length() - 6);
+                user.setPassword(BCrypt.hashpw(lastSixDigits, BCrypt.gensalt()));
                 user.setCredentialNumber(credentialNumber);
                 user.setCreateUserId(createUserId);
                 user.setCreateDate(LocalDateTime.now());

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -455,8 +455,11 @@
         <if test="dto.keyword != null and dto.keyword != ''">
             AND (t1.name like concat('%', #{dto.keyword}, '%') OR t1.credential_number like concat('%', #{dto.keyword}, '%'))
         </if>
-        <if test="dto.name != null and dto.name != '' and dto.idNumber != null and dto.idNumber != ''">
-            AND t1.name = #{dto.name} and t1.credential_number = #{dto.idNumber}
+        <if test="dto.name != null and dto.name != ''">
+            AND t1.name = #{dto.name}
+        </if>
+        <if test="dto.idNumber != null and dto.idNumber != ''">
+            AND t1.credential_number = #{dto.idNumber}
         </if>
         <if test="dto.userId != null">
             AND t1.id = #{dto.userId}