From 00506cc7ca021a60126a4f1ba10848fd3b3e30e9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Sat, 11 Oct 2025 11:20:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ma/controller/DirectRotationController.java    | 1 -
 .../resources/mapper/material/back/BackApplyInfoMapper.xml  | 2 +-
 .../mapper/material/lease/LeaseApplyInfoMapper.xml          | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java
index 57a9b220..1dd93aed 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java
@@ -60,7 +60,6 @@ public class DirectRotationController extends BaseController {
                                 break;
                             }
                         } else if (useringDatum.getMaId() != null && useringDatum.getMaId().equals(agreementInfo.getMaId())) {
-                            // 匹配成功，不需要添加到datas
                             shouldAdd = false;
                             break;
                         }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index f0ca5baa..b50ff05d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             JOIN ma_type_repair mtr ON mtr.type_id = bad.type_id AND mtr.user_id = #{userId}
         </if>
         WHERE
-        bai.back_style = '1'
+        bai.back_style = '1' and bai.direct_id is null
         <if test="unitId != null">
             and bu.unit_id = #{unitId}
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index b3c5b276..4cc7b865 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaseType != null  and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
             <if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if>
             <if test="costBearingParty != null  and costBearingParty != ''"> and lai.cost_bearing_party = #{costBearingParty}</if>
-            and tt.task_type = '2'
+            and tt.task_type = '2' and lai.direct_id is null
         </where>
         GROUP BY lai.id
         ORDER BY tt.task_status,tt.create_time desc
@@ -589,7 +589,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt3 ON mt1.parent_id = mt3.type_id and mt3.del_flag = '0'
                 LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0'
         WHERE
-        lod.lease_sign_id is null
+        lod.lease_sign_id is null and lai.direct_id is null
           and tt.task_type = '2'
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             <![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
@@ -703,7 +703,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt3 ON mt1.parent_id = mt3.type_id and mt3.del_flag = '0'
                 LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0'
         WHERE
-        lod.lease_sign_id is null
+        lod.lease_sign_id is null and lai.direct_id is null
         and tt.task_type = '19'
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             <![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>