From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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..5f5cf52 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,7 +5,7 @@
     <!--派遣公司分页信息-->
     <select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
         select
-            sdu.*,bt.dept_name tenantName
+            sdu.*,bt.dept_name deptName
         from
             sys_dispatcher_unit sdu
         LEFT JOIN
@@ -14,8 +14,8 @@
             sdu.dept_id = bt.id
         WHERE
             1=1
-        <if test="dispatcherUnit.tenantName!=null and  dispatcherUnit.tenantName!=''">
-            and bt.dept_name like concat('%', #{dispatcherUnit.tenantName},'%')
+        <if test="dispatcherUnit.deptName!=null and  dispatcherUnit.deptName!=''">
+            and bt.dept_name like concat('%', #{dispatcherUnit.deptName},'%')
         </if>
         <if test="dispatcherUnit.name!=null and  dispatcherUnit.name!=''">
             and sdu.name like concat('%', #{dispatcherUnit.name},'%')
@@ -38,6 +38,10 @@
         <if test="dispatcherUnit.district!=null">
             and sdu.district = #{dispatcherUnit.district}
         </if>
+        <if test="dispatcherUnit.beginTime!=null or dispatcherUnit.overTime!=null">
+            and sdu.end_time &lt;= #{dispatcherUnit.overTime} and sdu.end_time &gt;= #{dispatcherUnit.beginTime}
+            or ( sdu.start_time &lt;= #{dispatcherUnit.overTime} and sdu.start_time &gt;= #{dispatcherUnit.beginTime})
+        </if>
     </select>
 
     <!--自定义树-->
@@ -52,8 +56,8 @@
         sdu.dept_id = bt.id
         WHERE
         1=1
-        <if test="dispatcherUnit.tenantName!=null and  dispatcherUnit.tenantName!=''">
-            and bt.dept_name like concat('%', #{dispatcherUnit.tenantName},'%')
+        <if test="dispatcherUnit.deptName!=null and  dispatcherUnit.deptName!=''">
+            and bt.dept_name like concat('%', #{dispatcherUnit.deptName},'%')
         </if>
         <if test="dispatcherUnit.name!=null and  dispatcherUnit.name!=''">
             and sdu.name like concat('%', #{dispatcherUnit.name},'%')
@@ -82,7 +86,7 @@
     <!--派遣公司详细信息-->
     <select id="selectDispatcherUnitInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
         select
-            sdu.*,bt.dept_name tenantName
+            sdu.*,bt.dept_name deptName
         from
             sys_dispatcher_unit sdu
         LEFT JOIN

--
Gitblit v1.9.3