优化页面内嵌iframe切换tab不刷新数据

RuoYi

2022-08-23 52d50e4e47f95aecee2c426e25255e4cada2a33d

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

@@ -2,17 +2,21 @@


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;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.CollectionUtils;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.ServiceException;

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

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;

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

import com.ruoyi.system.domain.SysPost;

@@ -53,6 +57,9 @@


    @Autowired

    private ISysConfigService configService;



    @Autowired

    protected Validator validator;



    /**

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

@@ -127,16 +134,11 @@
    public String selectUserRoleGroup(String userName)

    {

        List<SysRole> list = roleMapper.selectRolesByUserName(userName);

        StringBuffer idsStr = new StringBuffer();

        for (SysRole role : list)

        if (CollectionUtils.isEmpty(list))

        {

            idsStr.append(role.getRoleName()).append(",");

            return StringUtils.EMPTY;

        }

        if (StringUtils.isNotEmpty(idsStr.toString()))

        {

            return idsStr.substring(0, idsStr.length() - 1);

        }

        return idsStr.toString();

        return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));

    }



    /**

@@ -149,16 +151,11 @@
    public String selectUserPostGroup(String userName)

    {

        List<SysPost> list = postMapper.selectPostsByUserName(userName);

        StringBuffer idsStr = new StringBuffer();

        for (SysPost post : list)

        if (CollectionUtils.isEmpty(list))

        {

            idsStr.append(post.getPostName()).append(",");

            return StringUtils.EMPTY;

        }

        if (StringUtils.isNotEmpty(idsStr.toString()))

        {

            return idsStr.substring(0, idsStr.length() - 1);

        }

        return idsStr.toString();

        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));

    }



    /**

@@ -179,7 +176,7 @@
    }



    /**

     * 校验用户名称是否唯一

     * 校验手机号码是否唯一

     *

     * @param user 用户信息

     * @return

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int insertUser(SysUser user)

    {

        // 新增用户信息

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int updateUser(SysUser user)

    {

        Long userId = user.getUserId();

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

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

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

    {

        userRoleMapper.deleteUserRoleByUserId(userId);

@@ -384,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());

    }



    /**

@@ -411,7 +392,7 @@
    public void insertUserPost(SysUser user)

    {

        Long[] posts = user.getPostIds();

        if (StringUtils.isNotNull(posts))

        if (StringUtils.isNotEmpty(posts))

        {

            // 新增用户与岗位管理

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

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

                list.add(up);

            }

            if (list.size() > 0)

            {

                userPostMapper.batchUserPost(list);

            }

            userPostMapper.batchUserPost(list);

        }

    }



@@ -437,7 +415,7 @@
     */

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

    {

        if (StringUtils.isNotNull(roleIds))

        if (StringUtils.isNotEmpty(roleIds))

        {

            // 新增用户与角色管理

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

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

                list.add(ur);

            }

            if (list.size() > 0)

            {

                userRoleMapper.batchUserRole(list);

            }

            userRoleMapper.batchUserRole(list);

        }

    }



@@ -462,7 +437,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public int deleteUserById(Long userId)

    {

        // 删除用户与角色关联

@@ -479,12 +454,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);

@@ -521,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);

@@ -529,6 +506,7 @@
                }

                else if (isUpdateSupport)

                {

                    BeanValidators.validateWithException(validator, user);

                    user.setUpdateBy(operName);

                    this.updateUser(user);

                    successNum++;