From 6c122cb9618258b109230df9b9166ac12b20c9e9 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Sun, 14 May 2023 09:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96-=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=205.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IZyProductPlanAutoServiceImpl.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java
index d2700964..19c3e362 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java
@@ -427,7 +427,10 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl<ZyProductPlanMapp
     @Transactional(rollbackFor = Exception.class, readOnly = false)
     public void diffWorker(List<ZyPlanProcess> zyPlanProcessList, final String planId) {
         ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
-        Groupx groupx = iGroupxService.getOne(new LambdaQueryWrapper<Groupx>().eq(Groupx::getDepartId, zyProductPlan.getWorkshopId()));
+        Groupx groupx = iGroupxService.getOne(new LambdaQueryWrapper<Groupx>()
+                .eq(Groupx::getDepartId, zyProductPlan.getWorkshopId())
+                .eq(Groupx::getId, zyProductPlan.getTeamId())
+        );
         List<GroupxMember> memberList = iGroupxMemberService.list(new LambdaQueryWrapper<GroupxMember>()
                 .eq(GroupxMember::getGroupxId, groupx.getId()));
         if (ObjectUtils.isEmpty(memberList)) return;