From 3f43ede2283066a5f5a33a74337ed7a2e1fef7ea Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 1 Jul 2022 15:19:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=88=87=E6=8D=A2=E4=B8=BA=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=8F=AF=E5=88=87=E6=8D=A2=E7=9A=84=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a676dfdde..3cc0b4441 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -961,7 +961,7 @@ module.exports = { ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', taskConfirmationDeadline: 'Task Confirmation Deadline', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', taskConfirmationResponsiblePerson:'Task confirmation of responsible person', or: 'or', warningTime: 'Warning time', From e3c24759474f61edbb53d3a3e771ae82d88a6097 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 1 Jul 2022 15:21:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=BC=8F=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectTaskInventoryEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 05f91babd..54a89a29c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -635,6 +635,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl projectYearInfoEOQueryWrapper = new QueryWrapper<>(); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); + ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); + SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); String msgContentEN = "";