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;
@@ -71,8 +74,13 @@
    @Autowired
    protected Validator validator;
    @Autowired
    private ZfAncestorService zfService;
    @Resource
    private ZInfoUserService zInfoUserService;
    @Override
    public List<String> findUserNames(Long[] ids) {
@@ -95,6 +103,11 @@
    public List<SysUser> selectUserList(SysUser user)
    {
        return userMapper.selectUserList(user);
    }
    @Override
    public List<SysUser> selectCommonUserList(SysUser user) {
        return userMapper.selectCommonUserList(user);
    }
    /**
@@ -133,6 +146,11 @@
    public SysUser selectUserByUserName(String userName)
    {
        return userMapper.selectUserByUserName(userName);
    }
    @Override
    public SysUser selectUserByNickName(String nickName) {
        return userMapper.selectUserByNickName(nickName);
    }
    /**
@@ -199,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;
    }
    /**
     * 校验手机号码是否唯一
     *
@@ -257,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);
@@ -569,6 +607,7 @@
                    roleId.setRoleId(2L);
                    roleList.add(roleId);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                }
                else if (isUpdateSupport)