From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 0798880..99ccbff
--- a/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml
@@ -113,7 +113,7 @@
         and t.parent_org_id = uo.org_id
         and uo.status_cd = '0'
         <if test="staffId != null and staffId !=''">
-            and uosr.org_id = uo.org_id
+            and uosr.org_id = t.org_id
             and uosr.staff_id = #{staffId}
             and uosr.status_cd = '0'
         </if>
@@ -205,7 +205,7 @@
         and t.parent_org_id = uo.org_id
         and uo.status_cd = '0'
         <if test="staffId != null and staffId !=''">
-            and uosr.org_id = uo.org_id
+            and uosr.org_id = t.org_id
             and uosr.staff_id = #{staffId}
             and uosr.status_cd = '0'
         </if>
@@ -239,6 +239,9 @@
         <if test="allowOperation !=null and allowOperation != ''">
             and t.allow_operation= #{allowOperation}
         </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
 
     </select>
     <!-- 鏌ヨ涓婄骇缁勭粐淇℃伅 -->

--
Gitblit v1.8.0