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/mapper/OrganizationMapper.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/OrganizationMapper.java b/src/main/java/com/moral/mapper/OrganizationMapper.java
index f0ce07d..de48897 100644
--- a/src/main/java/com/moral/mapper/OrganizationMapper.java
+++ b/src/main/java/com/moral/mapper/OrganizationMapper.java
@@ -1,7 +1,27 @@
package com.moral.mapper;
+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);
+
+ /**
+ * ���������������������������������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