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/resources/mapper/DictionaryDataMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DictionaryDataMapper.xml b/src/main/resources/mapper/DictionaryDataMapper.xml
index 67efb58..9e18298 100644
--- a/src/main/resources/mapper/DictionaryDataMapper.xml
+++ b/src/main/resources/mapper/DictionaryDataMapper.xml
@@ -16,8 +16,12 @@
id, dict_id, dict_data_key, dict_data_name, dict_data_value, is_fixed, is_delete,
parent_id, description
</sql>
- <select id="selectSupperOrgId" parameterType="java.lang.String" resultType="java.lang.Integer">
+ <select id="selectSupperOrgId" resultType="java.lang.Integer">
select dict_data_value from dictionary_data
where dict_data_key = 'auth_config_super_org'
</select>
+ <select id="isSupperOrgId" resultType="java.lang.Boolean">
+ select count(*) from dictionary_data
+ where dict_data_key = 'auth_config_super_org' and dict_data_value = #{orgId,jdbcType=INTEGER}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0