liujie
2025-06-27 3632162b5cbffbe53f86094604f213d20fda2e35
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemUserServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,6 +33,7 @@
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
 * @author zhibing.pu
@@ -58,8 +60,30 @@
        Page page = new Page<>();
        page.setCurrent(query.getPageNum());
        page.setSize(query.getPageSize());
        IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
        return list;
        if(query.getDeptId()!=null || user.getAccountLevel()==2){
            IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
            return list;
        }else {
            List<Integer> deptIds=new ArrayList<>();
            if(user.getAccountLevel()==3){
                List<Long> ids = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, user.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
                List<Department> list = departmentService.list(new LambdaQueryWrapper<Department>().eq(Department::getTier, 3).eq(Department::getStreetId, user.getStreetId())
                        .or(department -> department.and(department1 -> department1.eq(Department::getTier, 4).in(Department::getCommunityId, ids))));
                if(list.isEmpty()){
                    return new Page<>();
                }
                deptIds= list.stream().map(Department::getId).collect(Collectors.toList());
            }else if(user.getAccountLevel()==4){
                List<Department> list = departmentService.list(new LambdaQueryWrapper<Department>().eq(Department::getTier, 4).eq(Department::getCommunityId, user.getCommunityId()));
                if(list.isEmpty()){
                    return new Page<>();
                }
                deptIds= list.stream().map(Department::getId).collect(Collectors.toList());
            }
            IPage<SystemUserListVo> list = this.baseMapper.list1(page, user, query,deptIds);
            return list;
        }
    }
    /**