From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/OrganizationService.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/service/OrganizationService.java b/src/main/java/com/moral/service/OrganizationService.java
index e210565..11b1d39 100644
--- a/src/main/java/com/moral/service/OrganizationService.java
+++ b/src/main/java/com/moral/service/OrganizationService.java
@@ -5,20 +5,24 @@
 import java.util.Set;
 
 import com.moral.common.bean.PageBean;
-import com.moral.entity.DeviceVersion;
 import com.moral.entity.Organization;
 
 public interface OrganizationService {
-	Set<Integer> getChildOrganizationIds(Integer orgId);
+    Set<Integer> getChildOrganizationIds(Integer orgId);
 
-	List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);
+    List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);
 
-	public PageBean queryByPageBean(PageBean pageBean);
+    public PageBean queryByPageBean(PageBean pageBean);
 
-	public void addOrModify(Organization organization);
+    public void addOrModify(Organization organization);
 
-	public void deleteByIds(Integer... ids);
-	
-	List<Organization> getOrganizationsByName(String name);
-    public Organization getOrganizationsById(int id);
+    public void deleteByIds(Integer... ids);
+
+    List<Organization> getOrganizationsByName(String name);
+
+    public Organization getOrganizationById(int id);
+
+    public Organization getFatherOrg(int childId);
+
+    List<Organization> getOrganizationList(String organizationName);
 }

--
Gitblit v1.8.0