From e48d9d99d2a3402a18204b734746963c547a5b9d Mon Sep 17 00:00:00 2001 From: CaptainB Date: Fri, 29 Oct 2021 16:01:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E6=97=B6=E7=9A=84=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/notice/service/NoticeService.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java index b339095485..e26266b470 100644 --- a/backend/src/main/java/io/metersphere/notice/service/NoticeService.java +++ b/backend/src/main/java/io/metersphere/notice/service/NoticeService.java @@ -215,18 +215,11 @@ public class NoticeService { } catch (Exception e) { task = new MessageTask(); - List columns = ReflexObjectUtil.getColumns(task, SystemReference.messageColumns); - OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(task.getId()), null, - StatusReference.statusMap.containsKey(task.getTaskType()) ? StatusReference.statusMap.get(task.getTaskType()) : task.getTaskType(), task.getUserId(), columns); - return JSON.toJSONString(details); } } - if (task != null) { - List columns = ReflexObjectUtil.getColumns(task, SystemReference.messageColumns); - OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(task.getId()), null, - StatusReference.statusMap.containsKey(task.getTaskType()) ? StatusReference.statusMap.get(task.getTaskType()) : task.getTaskType(), task.getUserId(), columns); - return JSON.toJSONString(details); - } - return null; + List columns = ReflexObjectUtil.getColumns(task, SystemReference.messageColumns); + OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(task.getId()), null, + StatusReference.statusMap.containsKey(task.getTaskType()) ? StatusReference.statusMap.get(task.getTaskType()) : task.getTaskType(), null, columns); + return JSON.toJSONString(details); } }