From 7c86454ff569dc54bbe7e34988750a1df762a2c3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 10:42:33 +0800
Subject: [PATCH] 内网密码修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 072ed43..f7f8f1c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,15 +5,19 @@
     <!--派遣公司分页信息-->
     <select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
         select
-            sdu.*,bt.dept_name tenantName
+        sdu.*,bt.dept_name deptName,sj.dept_name jurisdictionName
         from
-            sys_dispatcher_unit sdu
+        sys_dispatcher_unit sdu
         LEFT JOIN
-            blade_dept bt
+        blade_dept bt
         ON
-            sdu.dept_id = bt.id
+        sdu.dept_id = bt.id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = sdu.jurisdiction
         WHERE
-            1=1
+        1=1
         <if test="dispatcherUnit.tenantName!=null and  dispatcherUnit.tenantName!=''">
             and bt.dept_name like concat('%', #{dispatcherUnit.tenantName},'%')
         </if>
@@ -29,6 +33,9 @@
         <if test="dispatcherUnit.province!=null">
             and sdu.province = #{dispatcherUnit.province}
         </if>
+        <if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
+            and sdu.dept_id = #{dispatcherUnit.deptId}
+        </if>
         <if test="dispatcherUnit.city!=null">
             and sdu.city = #{dispatcherUnit.city}
         </if>
@@ -38,6 +45,13 @@
         <if test="dispatcherUnit.district!=null">
             and sdu.district = #{dispatcherUnit.district}
         </if>
+        <if test="dispatcherUnit.isExpire==1">
+            and sdu.start_time &lt;= now()
+            and sdu.end_time &gt; now()
+        </if>
+        <if test="dispatcherUnit.isExpire==2">
+            and sdu.end_time &lt;= now()
+        </if>
     </select>
 
     <!--自定义树-->

--
Gitblit v1.9.3