没生效 重新上传

zqy

2025-06-22 8d21a2ee4d863a3422a1def79b9f1928c00d22aa

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

@@ -11,7 +11,9 @@
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,6 +73,8 @@
    @Autowired
    protected Validator validator;

    @Autowired
    private ZfAncestorService zfService;
    @Resource
    private ZInfoUserService zInfoUserService;

@@ -95,6 +99,11 @@
    public List<SysUser> selectUserList(SysUser user)
    {
        return userMapper.selectUserList(user);
    }

    @Override
    public List<SysUser> selectCommonUserList(SysUser user) {
        return userMapper.selectCommonUserList(user);
    }

    /**
@@ -207,7 +216,7 @@
    @Override
    public boolean checkNickNameUnique(SysUser user) {
        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
        SysUser info = userMapper.checkNickNameUnique(user.getNickName());
        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
        {
            return UserConstants.NOT_UNIQUE;
@@ -274,7 +283,15 @@
    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);