优化代码

RuoYi

2022-09-09 e3b12f5621abf80b7c52355c0f6c27dcec7a083d

 src/main/java/com/ruoyi/project/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.exception.ServiceException;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

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

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

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

import com.ruoyi.project.system.domain.SysPost;

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


    @Autowired

    private ISysConfigService configService;



    @Autowired

    protected Validator validator;



    /**

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

@@ -376,23 +381,7 @@
     */

    public void insertUserRole(SysUser user)

    {

        Long[] roles = user.getRoleIds();

        if (StringUtils.isNotNull(roles))

        {

            // 新增用户与角色管理

            List<SysUserRole> list = new ArrayList<SysUserRole>();

            for (Long roleId : roles)

            {

                SysUserRole ur = new SysUserRole();

                ur.setUserId(user.getUserId());

                ur.setRoleId(roleId);

                list.add(ur);

            }

            if (list.size() > 0)

            {

                userRoleMapper.batchUserRole(list);

            }

        }

        this.insertUserRole(user.getUserId(), user.getRoleIds());

    }



    /**

@@ -403,10 +392,10 @@
    public void insertUserPost(SysUser user)

    {

        Long[] posts = user.getPostIds();

        if (StringUtils.isNotNull(posts))

        if (StringUtils.isNotEmpty(posts))

        {

            // 新增用户与岗位管理

            List<SysUserPost> list = new ArrayList<SysUserPost>();

            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);

            for (Long postId : posts)

            {

                SysUserPost up = new SysUserPost();

@@ -414,10 +403,7 @@
                up.setPostId(postId);

                list.add(up);

            }

            if (list.size() > 0)

            {

                userPostMapper.batchUserPost(list);

            }

            userPostMapper.batchUserPost(list);

        }

    }



@@ -429,10 +415,10 @@
     */

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

    {

        if (StringUtils.isNotNull(roleIds))

        if (StringUtils.isNotEmpty(roleIds))

        {

            // 新增用户与角色管理

            List<SysUserRole> list = new ArrayList<SysUserRole>();

            List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);

            for (Long roleId : roleIds)

            {

                SysUserRole ur = new SysUserRole();

@@ -440,10 +426,7 @@
                ur.setRoleId(roleId);

                list.add(ur);

            }

            if (list.size() > 0)

            {

                userRoleMapper.batchUserRole(list);

            }

            userRoleMapper.batchUserRole(list);

        }

    }



@@ -477,6 +460,7 @@
        for (Long userId : userIds)

        {

            checkUserAllowed(new SysUser(userId));

            checkUserDataScope(userId);

        }

        // 删除用户与角色关联

        userRoleMapper.deleteUserRole(userIds);

@@ -513,6 +497,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 +506,7 @@
                }

                else if (isUpdateSupport)

                {

                    BeanValidators.validateWithException(validator, user);

                    user.setUpdateBy(operName);

                    this.updateUser(user);

                    successNum++;