From 2877d58a1f02839a26299ca5ba43dfbb1f052ccf Mon Sep 17 00:00:00 2001
From: fcli <fcli@che300.com>
Date: Mon, 5 Dec 2022 17:51:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20sqlserver=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salarybill/SalarySendInfoMapper.xml       | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 412175d23..536560045 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -318,7 +318,7 @@
         <!-- 发送状态 -->
         <if test="param.sendStatusVal != null">
             AND t1.send_status = #{param.sendStatusVal}
-            </if>
+        </if>
         <if test="param.isGranted != null">
             <if test="param.isGranted">
                 and t1.send_status = 1
@@ -347,9 +347,17 @@
          WHERE
           t1.delete_type = 0
 
-         <if test="param.sendStatusVal != null">
-             AND t1.send_status = #{param.sendStatusVal}
-         </if>
+        <if test="param.sendStatusVal != null">
+            AND t1.send_status = #{param.sendStatusVal}
+        </if>
+        <if test="param.isGranted != null">
+            <if test="param.isGranted">
+                and t1.send_status = 1
+            </if>
+            <if test="!param.isGranted">
+                and t1.send_status in (0, 2)
+            </if>
+        </if>
          <include refid="paramSql"/>
          <!-- 排序 -->
          <if test="param.orderRule != null">
@@ -367,11 +375,18 @@
          LEFT JOIN hrmdepartment d ON d.id = e.DEPARTMENTID
          LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
          LEFT JOIN hrsa_tax_agent t2 ON t2.id = t1.tax_agent_id
-         WHERE
-         t1.delete_type = 0
-         <if test="param.sendStatusVal != null">
-             AND t1.send_status = #{param.sendStatusVal}
-         </if>
+         WHERE t1.delete_type = 0
+        <if test="param.sendStatusVal != null">
+            AND t1.send_status = #{param.sendStatusVal}
+        </if>
+        <if test="param.isGranted != null">
+            <if test="param.isGranted">
+                and t1.send_status = 1
+            </if>
+            <if test="!param.isGranted">
+                and t1.send_status in (0, 2)
+            </if>
+        </if>
 
          <include refid="paramSql"/>
          <!-- 排序 -->