diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 96d366fde..5e73a8002 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1622,7 +1622,7 @@ public class FeishuServiceImpl implements IFeishuService { if(StringUtils.isNotBlank(flag)){ templateVariableMap.put("initiatorEn"," " + initiatorEn); }else{ - templateVariableMap.put("initiatorEn"," " + initiatorCn); + templateVariableMap.put("initiatorCn"," " + initiatorCn); } templateVariableMap.put("dueDate"," " + dueDate); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 2063aa759..41a690f71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2590,7 +2590,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId()); processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue()); List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) { String verifyPId = processInfoDetailEOS.get(0).getActiProcInstId(); @@ -1133,7 +1135,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl adds, String belong) {