From 71af6ab3e5c70da2e23014d154c692ba1963d80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 10 Dec 2022 13:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=95=86=E6=9C=8D=E5=8A=A1=E6=B7=BB=E5=8A=A0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 4 ++-- .../src/main/java/com/xm/core/service/XmTaskService.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index d3e0d83a..1fdf6abe 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -399,7 +399,7 @@ public class XmTaskController { String createUserid= (String) xmTaskMap.get("createUserid"); String createUsername= (String) xmTaskMap.get("createUsername"); for (XmTask task : can) { - if(!user.getUserid().equals(createUserid) && "1".equals(task.getStatus())) { + if(!user.getUserid().equals(createUserid) && !"0".equals(task.getStatus())) { notifyMsgService.pushMsg(user, createUserid, createUsername, "2", task.getProjectId(), task.getId(), "您成为任务【" + task.getName() + "】的负责人，请注意跟进。"); } } @@ -1020,7 +1020,7 @@ public class XmTaskController { xmTaskService.batchImportFromTemplate(xmTasks); for (XmTask t : xmTasks) { - if(!user.getUserid().equals(t.getCreateUserid())) { + if(!user.getUserid().equals(t.getCreateUserid()) && !"0".equals(t.getStatus())) { notifyMsgService.pushMsg(user, t.getCreateUserid(), t.getCreateUsername(), "2", t.getProjectId(), t.getId(), "您成为任务【" + t.getName() + "】的负责人，请注意跟进。"); } xmRecordService.addXmTaskRecord(t.getProjectId(), t.getId(), "项目-任务-批量新增任务", "新增任务"+t.getName(),"",null); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index a1da75ad..527a4605 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -287,8 +287,10 @@ public class XmTaskService extends BaseService { //新增日志 xmRecordService.addXmTaskRecord(xmTask.getProjectId(), xmTask.getId(), "项目-任务-新增任务", "新增任务"+xmTask.getName()); - - notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), "您成为任务【" + xmTask.getName() + "】的负责人，请注意跟进。"); + //草稿不提醒 + if(!"0".equals(xmTaskVo.getStatus())){ + notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), "您成为任务【" + xmTask.getName() + "】的负责人，请注意跟进。"); + } return xmTaskVo; }