|
|
@@ -457,11 +457,12 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
|
|
|
SysDeptVo sysDeptVo = new SysDeptVo();
|
|
|
String id = byUserId.getId();
|
|
|
List<String> deptIds = new ArrayList<>();
|
|
|
+ //admin看全部
|
|
|
if ("admin".equals(byUserId.getId())) {
|
|
|
List<SysDept> sysDeptList = sysDeptMapper.queryFiveLevelDept(sysDeptVo);
|
|
|
deptIds.addAll(sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList()));
|
|
|
} else {
|
|
|
-
|
|
|
+ //后线员工判断：是否为机构负责人，是：看所属机构下的 ；否：看所有的
|
|
|
List<SysDept> sysDeptList1 = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getLeaderId, id));
|
|
|
if (sysDeptList1.size() > 0) {
|
|
|
if (sysDeptList1.size() == 1) {
|
|
|
@@ -561,7 +562,6 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
|
|
|
}
|
|
|
List<SysUser> topUsers = new ArrayList<>(); //存放1级用户,即没有直接上级的用户
|
|
|
// 根据组织结构展示级别，筛选顶层节点并构建组织结构树
|
|
|
- //topUsers.add(sysUserMapper.selectById("99D1501"));
|
|
|
if ("admin".equals(sysUser.getName())) {
|
|
|
topUsers.add(sysUserMapper.selectById("99D1501"));
|
|
|
} else {
|
