From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/OrganizationService.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/OrganizationService.java b/src/main/java/com/moral/service/OrganizationService.java
index a835f01..11b1d39 100644
--- a/src/main/java/com/moral/service/OrganizationService.java
+++ b/src/main/java/com/moral/service/OrganizationService.java
@@ -1,9 +1,28 @@
package com.moral.service;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import com.moral.common.bean.PageBean;
+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);
+ public PageBean queryByPageBean(PageBean pageBean);
+
+ public void addOrModify(Organization organization);
+
+ 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