Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java

@@ -89,6 +89,7 @@

    @Override
    public void insertUser(User user) {
        user.setLastUpdatePasswordTime(new Date());
        userMapper.insert(user);
        eventPublisher.publishEvent(new OnRegistrationCompleteEvent(user));
    }
@@ -96,6 +97,9 @@
    @Override
    @Transactional(rollbackFor = BusinessException.class)
    public void insertUsers(List<User> users) {
        users.stream().forEach(item -> {
            item.setLastUpdatePasswordTime(new Date());
        });
        userMapper.insertUsers(users);
        throw new BusinessException("test BusinessException roll back");
    }
@@ -189,7 +193,6 @@
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(User::getId, form.getUserId())
                .set(User::getPassword, authenticationService.pwdEncode(form.getNewPassword()))
                .set(User::getNeedUpdatePassword, YesOrNoEnum.NO)
                .set(User::getLastUpdatePasswordTime, new Date())
                .update();
    }