From 95ddc8df9362fcf1d7265c8b46cb3502d16cc641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 10 Jul 2022 22:48:40 +0800 Subject: [PATCH] bug --- .../java/com/xm/core/ctrl/XmTaskController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 6524a2ea..76922d79 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 @@ -318,6 +318,19 @@ public class XmTaskController { } } } + List noExecs=new ArrayList<>(); + if(can.size()>0 && xmTaskMap.containsKey("taskState")){ + String taskState= (String) xmTaskMap.get("taskState"); + if("1".equals(taskState)){ + for (XmTask task : can) { + if(!StringUtils.hasText(task.getExecutorUserid()) && ("0".equals(task.getTaskState())||StringUtils.hasText(task.getTaskState()))){ + noExecs.add(task); + } + } + } + } + can=can.stream().filter(i->!noExecs.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList()); + if(can.size()>0){ xmTaskMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList())); @@ -349,6 +362,9 @@ public class XmTaskController { if(no.size()>0){ msgs.add(String.format("以下%s个任务无权限更新,【%s】。",no.size(),no.stream().map(i->i.getName()).collect(Collectors.joining(",")))); } + if(noExecs.size()>0){ + msgs.add(String.format("以下%s个任务未设置执行人，不能变更为待执行状态,【%s】。",noExecs.size(),noExecs.stream().map(i->i.getName()).collect(Collectors.joining(",")))); + } if(can.size()>0){ tips.setOkMsg(msgs.stream().collect(Collectors.joining())); }else {