From 8be6c90d7b5219e173a4eab97b10bfeb21f92745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 19 Jun 2022 01:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=A1=E7=AE=97=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=E5=8F=8A=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmTaskController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 3b14f49c..f8ca258a 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 @@ -758,12 +758,8 @@ public class XmTaskController { if(!StringUtils.hasText(batchImportVo.getPtype())){ return ResponseHelper.failed("ptype-0","请上送ptype,0代表项目计划（任务），1代表产品计划（任务）"); } - if("0".equals(batchImportVo.getPtype()) && !StringUtils.hasText(batchImportVo.getProjectId())){ + if(!StringUtils.hasText(batchImportVo.getProjectId())){ return ResponseHelper.failed("projectId-0","请上送项目编号"); - } else if("1".equals(batchImportVo.getPtype()) && !StringUtils.hasText(batchImportVo.getProductId())){ - return ResponseHelper.failed("productId-0","请上送产品编号"); - }else if(!"0".equals(batchImportVo.getPtype()) && !"1".equals(batchImportVo.getPtype())){ - return ResponseHelper.failed("ptype-0","请上送ptype,0代表项目计划（任务），1代表产品计划（任务）"); } String projectId=batchImportVo.getProjectId(); String productId=batchImportVo.getProductId(); @@ -851,7 +847,10 @@ public class XmTaskController { if(task.getLvl()>1){ task.setNtype("0"); }else{ - task.setNtype("1"); + if(!StringUtils.hasText(task.getNtype())){ + task.setNtype("1"); + } + } } }