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()); });