From 7690d03283226b22cb78a35137c5e1d493384be1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 15:32:55 +0800
Subject: [PATCH] 服务派遣统计接口修改

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 726fd56..cf72071 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1354,9 +1354,13 @@
         GROUP BY
         dept_id
         ) J ON J.dept_id = H.departmentid
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = H.jurisdiction
         WHERE 1 = 1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            AND H.jurisdiction in(${jurisdiction})
+            AND (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
         </if>
         <if test="deptid!=null and deptid!=''">
             AND H.departmentid = #{deptid}
@@ -3009,7 +3013,7 @@
             and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
         </if>
         ) b
-        where b.znum &lt; 2
+        where b.znum &lt; #{information.proportion}
         <if test="information.departmentid!=null and information.departmentid!=''">
             and b.departmentid = #{information.departmentid}
         </if>

--
Gitblit v1.9.3