update 补全事务注解异常

疯狂的狮子Li

2022-02-17 14c412113f661c4ebb1132424900dd4258dd108c

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@
import java.util.ArrayList;

import java.util.List;

import java.util.stream.Collectors;

import javax.validation.Validator;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -13,6 +14,7 @@
import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.SpringUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.bean.BeanValidators;

import com.ruoyi.common.datascope.annotation.DataScope;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.domain.SysRole;

@@ -55,6 +57,9 @@


    @Autowired

    private ISysConfigService configService;



    @Autowired

    protected Validator validator;



    /**

     * 根据条件分页查询用户列表

@@ -247,7 +252,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int insertUser(SysUser user)

    {

        // 新增用户信息

@@ -278,7 +283,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int updateUser(SysUser user)

    {

        Long userId = user.getUserId();

@@ -300,7 +305,7 @@
     * @param roleIds 角色组

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void insertUserAuth(Long userId, Long[] roleIds)

    {

        userRoleMapper.deleteUserRoleByUserId(userId);

@@ -454,7 +459,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int deleteUserById(Long userId)

    {

        // 删除用户与角色关联

@@ -471,12 +476,13 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int deleteUserByIds(Long[] userIds)

    {

        for (Long userId : userIds)

        {

            checkUserAllowed(new SysUser(userId));

            checkUserDataScope(userId);

        }

        // 删除用户与角色关联

        userRoleMapper.deleteUserRole(userIds);

@@ -513,6 +519,7 @@
                SysUser u = userMapper.selectUserByUserName(user.getUserName());

                if (StringUtils.isNull(u))

                {

                    BeanValidators.validateWithException(validator, user);

                    user.setPassword(SecurityUtils.encryptPassword(password));

                    user.setCreateBy(operName);

                    this.insertUser(user);

@@ -521,6 +528,7 @@
                }

                else if (isUpdateSupport)

                {

                    BeanValidators.validateWithException(validator, user);

                    user.setUpdateBy(operName);

                    this.updateUser(user);

                    successNum++;