From 65fbd4c72f9a158a5d673df9289be14221a62741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 29 Mar 2022 19:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmTaskWorkloadController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index 5a4f3f2c..f791b141 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -225,7 +225,7 @@ public class XmTaskWorkloadController { List noQxDel=new ArrayList<>(); for (XmTaskWorkload xmTaskWorkload : xmTaskWorkloads) { if(canDelTaskMap.containsKey(xmTaskWorkload.getTaskId())){ - if("!1".equals(xmTaskWorkload.getWstatus())){ + if(!"1".equals(xmTaskWorkload.getWstatus())){ canDel.add(xmTaskWorkload); } else{ state1Ndel.add(xmTaskWorkload); @@ -249,11 +249,11 @@ public class XmTaskWorkloadController { msgs.add("成功删除"+canDel.size()+"条工时单据。"); } if(state1Ndel.size()>0){ - msgs.add("以下"+state1Ndel.size()+"条工时单据状态为确认状态，不允许删除。【"+state1Ndel.stream().map(i->i.getUsername()+i.getBizDate())+"】"); + msgs.add("以下"+state1Ndel.size()+"条工时单据状态为确认状态，不允许删除。【"+state1Ndel.stream().map(i->i.getUsername()+i.getBizDate()).collect(Collectors.joining(","))+"】"); } if(noQxDel.size()>0){ xmTaskWorkloadService.batchDelete(canDel); - msgs.add("以下"+noQxDel.size()+"条工时单据无权限删除，您只能删除你负责的任务的工时单据，【"+noQxDel.stream().map(i->i.getUsername()+i.getBizDate())+"】."); + msgs.add("以下"+noQxDel.size()+"条工时单据无权限删除，您只能删除你负责的任务的工时单据，【"+noQxDel.stream().map(i->i.getUsername()+i.getBizDate()).collect(Collectors.joining(","))+"】."); } if(canDel.size()>0){ tips.setOkMsg(msgs.stream().collect(Collectors.joining()));