From af9b48679f123ca02391dce3a82f803f81b1c62a Mon Sep 17 00:00:00 2001 From: lizemin Date: Thu, 18 Apr 2024 11:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbswitch-admin-ui/src/views/task/assignment.vue | 6 ++---- .../com/gitee/dbswitch/admin/service/AssignmentService.java | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbswitch-admin-ui/src/views/task/assignment.vue b/dbswitch-admin-ui/src/views/task/assignment.vue index d874be19..367119bd 100644 --- a/dbswitch-admin-ui/src/views/task/assignment.vue +++ b/dbswitch-admin-ui/src/views/task/assignment.vue @@ -317,10 +317,8 @@ export default { height: 100%; } -.el-table__cell{ - background-color: #f5f7fa; /* 自定义背景色 */ - color: #303133; /* 自定义字体颜色 */ - border-right: 0px solid #EBEEF5!important; +/deep/ .el-table--border .el-table__cell{ + border-right:0px solid red !important; } .demo-table-expand { diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java index 200c69d1..e845becd 100644 --- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java +++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/AssignmentService.java @@ -160,7 +160,9 @@ public class AssignmentService { new LambdaQueryWrapper() .eq(AssignmentJobEntity::getAssignmentId, e.getId()).orderByDesc(AssignmentJobEntity::getCreateTime) .last(" limit 1 ")); - Integer status = assignmentJobEntity.getStatus(); + Integer status = (assignmentJobEntity == null || assignmentJobEntity.getStatus() == null) ? + JobStatusEnum.INIT.getValue() : + assignmentJobEntity.getStatus(); e.setRunStatus(JobStatusEnum.of(status).getName()); });