分页修改

chenrui

2 天以前 ab01a0f611c0adb97662bc8f548ca4a911ec8045

 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -1,9 +1,15 @@
package com.ruoyi.project.system.service.impl;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.stream.Collectors;

import javax.validation.Validator;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

import com.ruoyi.project.system.mapper.*;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

@@ -17,17 +23,8 @@
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;

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

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

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

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

import com.ruoyi.project.system.mapper.SysPostMapper;

import com.ruoyi.project.system.mapper.SysRoleMapper;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.mapper.SysUserPostMapper;

import com.ruoyi.project.system.mapper.SysUserRoleMapper;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.project.system.service.ISysDeptService;

import com.ruoyi.project.system.service.ISysUserService;



/**

@@ -38,6 +35,9 @@
@Service

public class SysUserServiceImpl implements ISysUserService

{

    @Autowired

    private SysUserDeptMapper sysUserDeptMapper;



    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);



    @Autowired

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


    @Autowired

    private ISysConfigService configService;



    @Autowired

    private ISysDeptService deptService;



    @Autowired

    protected Validator validator;

@@ -262,6 +265,8 @@
        insertUserPost(user);

        // 新增用户与角色管理

        insertUserRole(user);

        // 新增部门关联

        bindUserDept(user);

        return rows;

    }



@@ -489,7 +494,6 @@
        int failureNum = 0;

        StringBuilder successMsg = new StringBuilder();

        StringBuilder failureMsg = new StringBuilder();

        String password = configService.selectConfigByKey("sys.user.initPassword");

        for (SysUser user : userList)

        {

            try

@@ -499,9 +503,10 @@
                if (StringUtils.isNull(u))

                {

                    BeanValidators.validateWithException(validator, user);

                    String password = configService.selectConfigByKey("sys.user.initPassword");

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

                    user.setCreateBy(operName);

                    this.insertUser(user);

                    userMapper.insertUser(user);

                    successNum++;

                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");

                }

@@ -512,7 +517,7 @@
                    checkUserDataScope(u.getUserId());

                    user.setUserId(u.getUserId());

                    user.setUpdateBy(operName);

                    this.updateUser(user);

                    userMapper.updateUser(user);

                    successNum++;

                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");

                }

@@ -541,4 +546,35 @@
        }

        return successMsg.toString();

    }



    /**

     * 不分页用户查询

     * @param user

     * @return

     */

    @Override

    public List<SysUser> userListNoPage(SysUser user) {

        return userMapper.selectUserList(user);

    }



    /**

     * 绑定用户部门

     * @param user

     * @return

     */

    @Override

    public int bindUserDept(SysUser user) {

        // 删除所有关联绑定

        LambdaQueryWrapper<SysUserDept> delWrapper = new LambdaQueryWrapper<>();

        delWrapper.eq(SysUserDept::getUserId, user.getUserId());

        sysUserDeptMapper.delete(delWrapper);

        // 重新绑定

        for (int i = 0; i < user.getDeptIds().length; i++) {

            SysUserDept sysUserDept = new SysUserDept();

            sysUserDept.setDeptId(user.getDeptIds()[i]);

            sysUserDept.setUserId(user.getUserId());

            sysUserDeptMapper.insert(sysUserDept);

        }

        return user.getDeptIds().length;

    }

}