Commit e138f55e authored by zhangch's avatar zhangch

代码修改

parent ba84da4d
...@@ -30,10 +30,10 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService { ...@@ -30,10 +30,10 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService {
@Override @Override
public Page<SuperviseOrganEmpVO> superviseOrganEmpList(Page<SuperviseOrganEmpVO> page, Long organId, Boolean isIncluded, String organName, String superviseType, String superviseName, String superviseTel, String status) { public Page<SuperviseOrganEmpVO> superviseOrganEmpList(Page<SuperviseOrganEmpVO> page, Long organId, Boolean isIncluded, String organName, String superviseType, String superviseName, String superviseTel, String status) {
return superviseOrganEmpMapper.superviseOrganEmpList(page, getOrganIds(organId, isIncluded, organFeignService), organName, superviseType, superviseName, superviseTel, status); return superviseOrganEmpMapper.superviseOrganEmpList(page, getOrganIds(organId, isIncluded), organName, superviseType, superviseName, superviseTel, status);
} }
private List<Long> getOrganIds(Long organId, Boolean isIncluded, OrganFeignService organFeignService) { private List<Long> getOrganIds(Long organId, Boolean isIncluded) {
Result<List<Long>> organChild = null; Result<List<Long>> organChild = null;
List<Long> organIds = null; List<Long> organIds = null;
if (organId != null) { if (organId != null) {
...@@ -85,7 +85,7 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService { ...@@ -85,7 +85,7 @@ public class SuperviseOrganServiceImpl implements SuperviseOrganEmpService {
@Override @Override
public Page<SuperviseOrganVO> superviseOrganList(Page<SuperviseOrganVO> page, Long organId, Boolean isIncluded, String spvOrganName) { public Page<SuperviseOrganVO> superviseOrganList(Page<SuperviseOrganVO> page, Long organId, Boolean isIncluded, String spvOrganName) {
return superviseOrganMapper.superviseOrganList(page, getOrganIds(organId, isIncluded, organFeignService), spvOrganName); return superviseOrganMapper.superviseOrganList(page, getOrganIds(organId, isIncluded), spvOrganName);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment