From effd5e1074fb5b8b5a8bb18f9ff30aa54b6830ae Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 16 Jul 2025 17:27:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E9=85=92?=
 =?UTF-8?q?=E8=AD=A6=E5=91=98=E5=A4=B4=E5=83=8F=E6=9C=AA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=B8=93=E9=A1=B9=E7=9D=A3?=
 =?UTF-8?q?=E5=AF=9F=E6=9C=AA=E5=8C=B9=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/biutag/supervision/pojo/dto/NegativeImportDto.java | 2 +-
 src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDto.java
index 01949ff..41be69b 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDto.java
@@ -85,7 +85,7 @@ public class NegativeImportDto {
     private String specialSupervisionName;
 
     @ExcelIgnore
-    private String SpecialSupervision;
+    private String specialSupervision;
 
     // 通报期数
     @ExcelProperty("通报期数")
diff --git a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
index c583214..4ff991d 100644
--- a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
+++ b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
@@ -24,7 +24,7 @@
             peo.testing_files
         FROM
             sup_task_testing_alcohol_people peo
-                left join sup_police p on peo.id_code = p.id_code and p.del = 0
+                left join sup_police p on peo.emp_no = p.emp_no and p.del = 0
             left join sup_depart d on peo.depart_id = d.id
             ${ew.getCustomSqlSegment}