From 1240f6929b42d82802772a7f8f561f463edb4b81 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 12 Aug 2024 20:48:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=91=E6=B6=88=E6=81=AF=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=8F=98=E5=9B=9E=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/ReplaceImplementationDateMsgJob.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java index e0c5811a..723e834b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/ReplaceImplementationDateMsgJob.java @@ -11,8 +11,6 @@ import com.jero.modules.laws.standard.entity.LawsReplacedStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsReplacedStandardService; -import com.jero.modules.laws.standardmasterplan.entity.LawsStandardMasterPlan; -import com.jero.modules.laws.standardmasterplan.entity.LawsStandardMasterPlanSublist; import com.jero.modules.laws.standardmasterplan.servicce.ILawsStandardMasterPlanService; import com.jero.modules.laws.standardmasterplan.servicce.ILawsStandardMasterPlanSublistService; import com.jero.modules.personal.entity.LawsStandardCollection; @@ -27,8 +25,6 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import static com.jero.modules.laws.standardmasterplan.common.LawsStandardMasterPlanCommon.INFORMATION_INPUT; - @Slf4j public class ReplaceImplementationDateMsgJob implements Job { @@ -217,20 +213,7 @@ public class ReplaceImplementationDateMsgJob implements Job { standard = standard.split("《")[0]; LawsDomesticStandard replaceStandard = standardMap.get(standard); // 被代替标准的主起草人，责任人，收藏标准的人员 - LambdaQueryWrapper mpWrapper = new LambdaQueryWrapper<>(); - mpWrapper.eq(LawsStandardMasterPlan::getStandardId, replaceStandard.getId()); - List masterPlanList = masterPlanService.list(mpWrapper); - if (!masterPlanList.isEmpty()) { - // 找到所有类型为1的主计划信息的责任人 - LambdaQueryWrapper sublistWrapper = new LambdaQueryWrapper<>(); - sublistWrapper.eq(LawsStandardMasterPlanSublist::getType, INFORMATION_INPUT); - sublistWrapper.in(LawsStandardMasterPlanSublist::getMasterPlanId, - masterPlanList.stream().map(LawsStandardMasterPlan::getId).collect(Collectors.toList())); - List sublistList = masterPlanSublistService.list(sublistWrapper); - for (LawsStandardMasterPlanSublist sublist : sublistList) { - userIdSet.add(sublist.getResponsiblePerson()); - } - } + userIdSet.add(replaceStandard.getResponsibleUser()); // 获取收藏标准的所有人员 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsStandardCollection::getStandardId, replaceStandard.getId());