From 9a03d4a6f9b28af1bf13c9accf67de379d46c977 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Fri, 28 Aug 2026 16:25:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(supplierPerformance):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E4=BB=B7=E8=AF=B7=E6=B1=82=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改SQL查询逻辑，将INNER JOIN改为EXISTS子查询以优化性能
- 调整删除流程，在删除前先查询获取必要数据避免删除后无法获取
- 修复删除失败时的错误提示信息
- 增加数据存在性验证确保删除操作的准确性
---
 .../impl/PerEvaluateRequestServiceImpl.java        |  8 ++++++--
 .../PerEvaluateRequestMapper.xml                   | 14 ++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java b/src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java
index 1706e43..77294a1 100644
--- a/src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java
+++ b/src/main/java/com/xujie/modules/supplierPerformance/service/impl/PerEvaluateRequestServiceImpl.java
@@ -302,12 +302,16 @@ public class PerEvaluateRequestServiceImpl extends ServiceImpl<PerEvaluateReques
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseData perEvaluateRequestDelete(PerEvaluateRequestEntity data) {
+        // 先查询再删除，删除后无法根据 id 再查到 requestNo/site
+        PerEvaluateRequestEntity one = lambdaQuery().eq(PerEvaluateRequestEntity::getId, data.getId()).one();
+        if (one == null) {
+            return buildError("单据不存在，删除失败 requestId=" + data.getId());
+        }
         // 删除头
         boolean hDel = removeById(data);
         if (!hDel) {
-            return buildError("单据不存在或删除失败 requestId=" + data.getId());
+            return buildError("单据删除失败 requestId=" + data.getId());
         }
-        PerEvaluateRequestEntity one = lambdaQuery().eq(PerEvaluateRequestEntity::getId, data.getId()).one();
         // 删除责任人明细
         perEvaluateRequestDetailMapper.delete(new QueryWrapper<PerEvaluateRequestOwnerEntity>()
                 .eq("site", one.getSite())
diff --git a/src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml b/src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml
index 3bafdd5..f09cfeb 100644
--- a/src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml
+++ b/src/main/resources/mapper/supplierPerformance/PerEvaluateRequestMapper.xml
@@ -19,14 +19,16 @@
         LEFT JOIN performance_indicator_template pit
         ON pit.site = a.site
         AND pit.template_no = a.template_no
-        <if test="query.selectType == 3">
-            INNER JOIN per_evaluate_request_owner o
-            ON o.site = a.site
-            AND o.request_no = a.request_no
-            AND o.owner = #{query.username}
-        </if>
         <where>
             a.site = #{query.site}
+            <if test="query.selectType == 3">
+                AND EXISTS (
+                    SELECT 1 FROM per_evaluate_request_owner o
+                    WHERE o.site = a.site
+                    AND o.request_no = a.request_no
+                    AND o.owner = #{query.username}
+                )
+            </if>
             <if test="query.selectType == 1">
                 AND a.create_by = #{query.username}
             </if>