Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

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;