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/mapper/OrganizationMapper.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/moral/mapper/OrganizationMapper.java b/src/main/java/com/moral/mapper/OrganizationMapper.java
index 56c73bb..de48897 100644
--- a/src/main/java/com/moral/mapper/OrganizationMapper.java
+++ b/src/main/java/com/moral/mapper/OrganizationMapper.java
@@ -3,18 +3,25 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Organization;
+
 import tk.mybatis.mapper.entity.Example;
 
 public interface OrganizationMapper extends BaseMapper<Organization> {
-	List<Organization> selectWithAreaNameByExample(Example example);
-	List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);
+    List<Organization> selectWithAreaNameByExample(Example example);
 
-	/**
-	 * ���������������������������������id���������id���������0
-	 * @param orgId
-	 * @return
-	 */
-	List<Integer> selectLowerOrgIds(Integer orgId);
+    List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);
+
+    /**
+     * ���������������������������������id���������id���������0
+     *
+     * @param orgId
+     * @return
+     */
+    List<Integer> selectLowerOrgIds(Integer orgId);
+
+    List<Organization> getOrganizationList(@Param("organizationName") String organizationName);
 }
\ No newline at end of file

--
Gitblit v1.8.0