Joburgess 5 rokov pred
rodič
commit
3d53f21c27

+ 3 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/OrganizationService.java

@@ -25,8 +25,9 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      * @describe 获取当前分部及其所有子分部编号
      * @author Joburgess
      * @date 2020.06.28
-     * @param organId:
+     * @param organId: 本单位编号
+     * @param includeSelf: 是否包含本单位
      * @return java.util.List<java.lang.Integer>
      */
-    List<Integer> getSelfAndChildOrganIds(Integer organId);
+    List<Integer> getChildOrganIds(Integer organId, boolean includeSelf);
 }

+ 4 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -130,7 +130,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
-	public List<Integer> getSelfAndChildOrganIds(Integer organId) {
+	public List<Integer> getChildOrganIds(Integer organId, boolean includeSelf) {
 		Organization organization = organDao.get(organId);
 		if(Objects.isNull(organization)){
 			throw new BizException("当前声部不存在");
@@ -142,7 +142,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(null == selfAndChildOrganIds){
 			selfAndChildOrganIds= Collections.EMPTY_LIST;
 		}
-		selfAndChildOrganIds.add(organization.getId());
+		if(includeSelf){
+			selfAndChildOrganIds.add(organization.getId());
+		}
 		return selfAndChildOrganIds;
 	}
 }