From ef214e1ab205dc02e390bd81cf41c8e6bb598151 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 23 Aug 2022 09:38:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/evaluationResultsClause.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index d32d78d9d..73673f51d 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -217,7 +217,7 @@ }, { title: this.$t('feedbackTime'), - dataIndex: 'createTime', + dataIndex: 'updateTime', align: 'center', ellipsis: true, width: 160 From abd77b852e2ba51d76850cd410fe2ce2c70810c0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 23 Aug 2022 09:49:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B8=85=E5=8D=95-=E6=89=B9=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=E5=92=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81-=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectTaskInventoryEOServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 9b8c9ac10..029bd88d1 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 @@ -495,20 +495,20 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl msgMap = new HashMap<>(); if ("1".equals(operation)) { - if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) { + if (! (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } else if ("2".equals(operation)) { - if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + if (!(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } - msgMapList.add(msgMap); } return getMsg(msgMapList, cut, operation); From 00c164bb48a1b7ee08ded3072640ce8c11a74572 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 23 Aug 2022 10:01:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=20=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/TaskList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 4f7b2c2a4..7aa780bb2 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -553,7 +553,7 @@ } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result == []){ + if(res.result.length == 0){ this.$refs.batchModelRef.getData(this.selectedRowKeys) }else{ this.NotSelectedNoEngineerValue = res.result @@ -587,7 +587,7 @@ } postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { if (res.success) { - if(res.result == []){ + if(res.result.length == 0){ this.$refs.batchChangeModelRef.getData(this.selectionRowsArray) }else{ this.NotSelectedNoEngineerValue = res.result