张氏APP 后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zqy
5 天以前 b02beccf4567068cb47a3f1181a00039456c872d 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java


@@ -8,10 +8,13 @@




import com.baomidou.mybatisplus.core.conditions.Wrapper;


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


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;


import com.baomidou.mybatisplus.extension.service.IService;


import com.ruoyi.domain.ZInfoUser;


import com.ruoyi.domain.ZfAncestor;


import com.ruoyi.service.ZInfoUserService;


import com.ruoyi.service.ZfAncestorService;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


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


@@ -60,6 +63,9 @@


    private SysUserRoleMapper userRoleMapper;




    @Autowired


    private SysUserRoleMapper sysUserRoleMapper;




    @Autowired


    private SysUserPostMapper userPostMapper;




    @Autowired


@@ -68,8 +74,13 @@


    @Autowired


    protected Validator validator;




    @Autowired


    private ZfAncestorService zfService;


    @Resource


    private ZInfoUserService zInfoUserService;










    @Override


    public List<String> findUserNames(Long[] ids) {


@@ -92,6 +103,11 @@


    public List<SysUser> selectUserList(SysUser user)


    {


        return userMapper.selectUserList(user);


    }




    @Override


    public List<SysUser> selectCommonUserList(SysUser user) {


        return userMapper.selectCommonUserList(user);


    }




    /**


@@ -130,6 +146,11 @@


    public SysUser selectUserByUserName(String userName)


    {


        return userMapper.selectUserByUserName(userName);


    }




    @Override


    public SysUser selectUserByNickName(String nickName) {


        return userMapper.selectUserByNickName(nickName);


    }




    /**


@@ -196,6 +217,17 @@


        return UserConstants.UNIQUE;


    }




    @Override


    public boolean checkNickNameUnique(SysUser user) {


        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();


        SysUser info = userMapper.checkNickNameUnique(user.getNickName());


        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())


        {


            return UserConstants.NOT_UNIQUE;


        }


        return UserConstants.UNIQUE;


    }




    /**


     * 校验手机号码是否唯一


     *


@@ -254,7 +286,16 @@


    @Override


    public void checkUserDataScope(Long userId)


    {


        if (!SysUser.isAdmin(SecurityUtils.getUserId()))


        //判断是否是管理员




        ZfAncestor zfAncestor = new ZfAncestor();


        zfAncestor.setSysId(userId);


        zfAncestor = zfService.selectZfAncestor(zfAncestor);


        System.out.println("---------++++++++____________");


        System.out.println(zfAncestor);


        //判断是否是超级管理员


        if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L)


//        if (!SysUser.isAdmin(SecurityUtils.getUserId()))


        {


            SysUser user = new SysUser();


            user.setUserId(userId);


@@ -296,7 +337,16 @@


    @Override


    public boolean registerUser(SysUser user)


    {


        return userMapper.insertUser(user) > 0;


        int satisfyCount = userMapper.insertUser(user);


        if (satisfyCount > 0) {


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


            SysUserRole roleId = new SysUserRole();


            roleId.setUserId(user.getUserId());


            roleId.setRoleId(2L);


            roleList.add(roleId);


            sysUserRoleMapper.batchUserRole(roleList);


        }


        return satisfyCount > 0;


    }




    /**


@@ -311,9 +361,9 @@


    {


        Long userId = user.getUserId();


        // 删除用户与角色关联


        userRoleMapper.deleteUserRoleByUserId(userId);


        // 新增用户与角色管理


        insertUserRole(user);


//        userRoleMapper.deleteUserRoleByUserId(userId);


//        // 新增用户与角色管理


//        insertUserRole(user);


        // 删除用户与岗位关联


        userPostMapper.deleteUserPostByUserId(userId);


        // 新增用户与岗位管理


@@ -471,7 +521,7 @@


        userRoleMapper.deleteUserRoleByUserId(userId);


        // 删除用户与岗位表


        userPostMapper.deleteUserPostByUserId(userId);


        return userMapper.deleteUserById(userId);


        return userMapper.deleteById(userId);


    }




    /**


@@ -494,22 +544,22 @@


        // 删除用户与岗位关联


        userPostMapper.deleteUserPost(userIds);


        //找到用户名


        List<String> unames = findUserNames(userIds);


        for(String name :unames) {




        for(long uid : userIds) {


          //  System.out.println(name.equals(""));


         //   System.out.println(name==null);




         //   if(name!="" || name != null) {


                ZInfoUser fs = new ZInfoUser();


                fs.setNickName(name);


                List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);


                System.out.println("902");


                ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);




                System.out.println(lis.size());


                if (!name.equals("") && lis.size() > 0)


                    userMapper.deleteUserByUserName(name);


                if(fs!=null)


                {


                    userMapper.deleteUserById(uid);


                }


                else


                    userMapper.deleteUserByName(name);


                {


                    userMapper.deleteById(uid);


                }


          //  }


        }




@@ -538,6 +588,8 @@


        StringBuilder successMsg = new StringBuilder();


        StringBuilder failureMsg = new StringBuilder();


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


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




        for (SysUser user : userList)


        {


            try


@@ -550,7 +602,12 @@


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


                    user.setCreateBy(operName);


                    this.insertUser(user);


                    SysUserRole roleId = new SysUserRole();


                    roleId.setUserId(user.getUserId());


                    roleId.setRoleId(2L);


                    roleList.add(roleId);


                    successNum++;




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


                }


                else if (isUpdateSupport)


@@ -577,6 +634,7 @@


                log.error(msg, e);


            }


        }


        sysUserRoleMapper.batchUserRole(roleList);


        if (failureNum > 0)


        {


            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");