From 23e5eaa3ffde198acc8dd4f91f834203cfcb9988 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 28 十一月 2019 00:48:52 +0800
Subject: [PATCH] 优化设备添加时加入位置信息
---
java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
index 246ae62..23f242f 100644
--- a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
@@ -84,10 +84,15 @@
<!-- 鏌ヨ缁勭粐淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOrgInfo" parameterType="Map" resultType="Map">
select t.org_name,t.org_name orgName,t.parent_org_id,t.parent_org_id
- parentOrgId,t.description,t.org_level,t.org_level orgLevel,t.status_cd,t.status_cd
- statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId
- from u_org t
+ parentOrgId,t.description,t.org_level,t.org_level orgLevel,td.name orgLevelName,t.status_cd,t.status_cd
+ statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,uo.org_name parentOrgName
+ from u_org t,t_dict td,u_org uo
where 1 =1
+ and t.org_level = td.status_cd
+ and td.table_name='u_org'
+ and td.table_columns = 'org_level'
+ and t.parent_org_id = uo.org_id
+ and uo.status_cd = '0'
<if test="orgName !=null and orgName != ''">
and t.org_name= #{orgName}
</if>
@@ -153,8 +158,13 @@
<!-- 鏌ヨ缁勭粐鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryOrgsCount" parameterType="Map" resultType="Map">
select count(1) count
- from u_org t
+ from u_org t,t_dict td,u_org uo
where 1 =1
+ and t.org_level = td.status_cd
+ and td.table_name='u_org'
+ and td.table_columns = 'org_level'
+ and t.parent_org_id = uo.org_id
+ and uo.status_cd = '0'
<if test="orgName !=null and orgName != ''">
and t.org_name= #{orgName}
</if>
@@ -184,14 +194,17 @@
</select>
<!-- 鏌ヨ涓婄骇缁勭粐淇℃伅 -->
<select id="getParentOrgInfo" parameterType="Map" resultType="Map">
- SELECT t.org_name,t.org_name orgName,t.parent_org_id,t.parent_org_id
- parentOrgId,t.description,t.org_level,t.org_level orgLevel,t.status_cd,t.status_cd
- statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId
- FROM u_org o,u_org t
- WHERE o.`org_level` = #{orgLevel}
- AND o.`store_id` = t.`store_id`
- AND o.`parent_org_id` = t.`org_id`
- AND o.`store_id` = #{storeId}
+ <![CDATA[
+ SELECT t.org_name,t.org_name orgName,t.parent_org_id,t.parent_org_id
+ parentOrgId,t.description,t.org_level,t.org_level orgLevel,t.status_cd,t.status_cd
+ statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId
+ FROM u_org o,u_org t
+ WHERE o.`org_level` = #{orgLevel}
+ AND o.`store_id` = t.`store_id`
+ AND o.`parent_org_id` = t.`org_id`
+ AND o.`org_id` <> o.`parent_org_id`
+ AND o.`store_id` = #{storeId}
+ ]]>
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0