From 63d521ea57863cbd6087ddce04d65830b20e2c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Fri, 16 Jan 2026 17:03:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(production):=20=E4=BF=AE=E5=A4=8D=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E8=AE=A1=E5=88=92=E8=A1=A8=E5=A4=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=AD=E7=9A=84=E7=8F=AD=E6=AC=A1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在ShiftInfo表关联条件中添加站点过滤条件
- 确保班次信息查询时考虑站点隔离
- 防止跨站点班次信息错误关联的问题
---
 src/main/resources/mapper/production/OperatorGroupMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/production/OperatorGroupMapper.xml b/src/main/resources/mapper/production/OperatorGroupMapper.xml
index afe9378..9c3406c 100644
--- a/src/main/resources/mapper/production/OperatorGroupMapper.xml
+++ b/src/main/resources/mapper/production/OperatorGroupMapper.xml
@@ -24,7 +24,7 @@
     <select id="getOperatorGroupPlanHeader" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanHeaderData">
         select a.Site,a.OperatorGroupId,a.WorkDate,a.Shiftno,a.allTime,a.WagesTime,a.id,b.OperatorName ,c.shiftdesc
         from OperatorGroupPlanHeader a left join Operator b on a.OperatorGroupId=b.OperatorID and a.site=b.site
-        left join ShiftInfo C on a.Shiftno=c.shiftno
+        left join ShiftInfo C on a.Shiftno=c.shiftno and a.site=c.site
             <where>
             <if test = "site != null and site != ''">
                 AND a.Site LIKE  #{site}