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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/OrganizationService.java b/src/main/java/com/moral/service/OrganizationService.java
index 11b1d39..aa62ce7 100644
--- a/src/main/java/com/moral/service/OrganizationService.java
+++ b/src/main/java/com/moral/service/OrganizationService.java
@@ -12,17 +12,19 @@
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);
- public Organization getOrganizationById(int id);
+ Organization getOrganizationById(int id);
- public Organization getFatherOrg(int childId);
+ Organization getFatherOrg(int childId);
List<Organization> getOrganizationList(String organizationName);
+
+ Organization getOrganizationByAccountId(Integer accountId);
}
--
Gitblit v1.8.0