|
@@ -138,15 +138,15 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
if(Objects.isNull(organization)){
|
|
if(Objects.isNull(organization)){
|
|
throw new BizException("当前声部不存在");
|
|
throw new BizException("当前声部不存在");
|
|
}
|
|
}
|
|
- StringBuffer parentOrganIdTag= new StringBuffer(Objects.isNull(organization.getParentOrganIdTag())?"":organization.getParentOrganIdTag());
|
|
|
|
|
|
+ StringBuffer parentOrganIdTag= new StringBuffer(organization.getParentOrganIdTag());
|
|
parentOrganIdTag.append(",");
|
|
parentOrganIdTag.append(",");
|
|
parentOrganIdTag.append(organization.getId());
|
|
parentOrganIdTag.append(organization.getId());
|
|
List<Integer> selfAndChildOrganIds = organDao.getChildOrganIds(parentOrganIdTag.toString());
|
|
List<Integer> selfAndChildOrganIds = organDao.getChildOrganIds(parentOrganIdTag.toString());
|
|
if(null == selfAndChildOrganIds){
|
|
if(null == selfAndChildOrganIds){
|
|
selfAndChildOrganIds= Collections.EMPTY_LIST;
|
|
selfAndChildOrganIds= Collections.EMPTY_LIST;
|
|
}
|
|
}
|
|
- if(includeSelf){
|
|
|
|
- selfAndChildOrganIds.add(organization.getId());
|
|
|
|
|
|
+ if(!includeSelf){
|
|
|
|
+ selfAndChildOrganIds.remove(organization.getId());
|
|
}
|
|
}
|
|
return selfAndChildOrganIds;
|
|
return selfAndChildOrganIds;
|
|
}
|
|
}
|