|
|
@@ -75,27 +75,16 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
parentId = SecurityUtils.getLoginUser().getSysUser().getOrgId();
|
|
|
}
|
|
|
SysOrg sysOrg = sysOrgMapper.selectById(parentId);
|
|
|
-
|
|
|
-// org.setParentId(null);
|
|
|
//查询条件
|
|
|
-// QueryWrapper<SysOrg> query = new QueryWrapper<>(org);
|
|
|
if (sysOrg != null) {
|
|
|
//下穿
|
|
|
if (org.getCheckSub()) {
|
|
|
org.setParentId(null);
|
|
|
org.setPath(sysOrg.getPath());
|
|
|
} else {
|
|
|
-// org.setPath("");
|
|
|
org.setPath(sysOrg.getPath());
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
-// //模糊查询
|
|
|
-// if (StringUtils.isNotNull(org.getName())) {
|
|
|
-// query.like("name", org.getName());
|
|
|
-// org.setName(null);
|
|
|
-// }
|
|
|
-// query.lambda().orderByAsc(SysOrg::getPath);
|
|
|
//获取数据
|
|
|
page = baseMapper.selectOrgList(page, org);
|
|
|
//抓换为TableDataInfo适配前端
|