From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/OrganizationService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/OrganizationService.java b/src/main/java/com/moral/service/OrganizationService.java
index b41561b..aa62ce7 100644
--- a/src/main/java/com/moral/service/OrganizationService.java
+++ b/src/main/java/com/moral/service/OrganizationService.java
@@ -5,17 +5,26 @@
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);
+ PageBean queryByPageBean(PageBean pageBean);
- public void addOrModify(Organization organization);
+ void addOrModify(Organization organization);
- public void deleteByIds(Integer... ids);
+ void deleteByIds(Integer... ids);
+
+ List<Organization> getOrganizationsByName(String name);
+
+ Organization getOrganizationById(int id);
+
+ Organization getFatherOrg(int childId);
+
+ List<Organization> getOrganizationList(String organizationName);
+
+ Organization getOrganizationByAccountId(Integer accountId);
}
--
Gitblit v1.8.0