From a6e065a1f7beb1f64e20870297807b3af324b040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 17 Feb 2022 21:12:49 +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

---
 .../com/xm/core/ctrl/XmMenuController.java    | 20 +++++++++++++++++++
 .../com/xm/core/ctrl/XmTaskController.java    | 13 ++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
index dcc822b1..ec453cf0 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
@@ -3,6 +3,7 @@ package com.xm.core.ctrl;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.utils.ResponseHelper;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
@@ -229,6 +230,25 @@ public class XmMenuController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功更新一条数据");
 		try{
+			if(!StringUtils.hasText(xmMenu.getMenuId())){
+				ResponseHelper.failed("menuId-0","menuId不能为空");
+			}
+			XmMenu xmMenuDb=xmMenuService.selectOneObject(new XmMenu(xmMenu.getMenuId()));
+			if(xmMenuDb==null){
+				ResponseHelper.failed("menu-0","该需求不存在");
+			}
+			if(StringUtils.hasText(xmMenu.getNtype())&&StringUtils.hasText(xmMenu.getNtype())&&StringUtils.hasText(xmMenuDb.getPmenuId())){
+				if(!xmMenuDb.getNtype().equals(xmMenu.getNtype())){
+					if(xmMenu.getNtype().equals("1")){
+						XmTask xmMenuParentDb=this.xmTaskService.selectOneObject(new XmTask(xmMenuDb.getPmenuId()));
+						if(xmMenuParentDb!=null){
+							if(!"1".equals(xmMenuParentDb.getNtype())){
+								ResponseHelper.failed("pmenu-ntype-0","上级任务"+xmMenuParentDb.getName()+"属于不是需求集,不能下挂需求集");
+							}
+						}
+					}
+				}
+			}
 			xmMenuService.updateByPk(xmMenu);
 			m.put("data",xmMenu);
 		}catch (BizException e) { 
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 587a24b2..b08442b5 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
@@ -9,6 +9,7 @@ import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.NumberUtil;
 import com.mdp.core.utils.RequestUtils;
+import com.mdp.core.utils.ResponseHelper;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
@@ -537,6 +538,18 @@ public class XmTaskController {
 				m.put("tips", tips);
 				return m;
 			}
+			if(StringUtils.hasText(xmTaskDb.getNtype())&&StringUtils.hasText(xmTaskVo.getNtype())&&StringUtils.hasText(xmTaskDb.getParentTaskid())){
+				if(!xmTaskDb.getNtype().equals(xmTaskVo.getNtype())){
+					if(xmTaskVo.getNtype().equals("1")){
+						XmTask xmTaskParentDb=this.xmTaskService.selectOneObject(new XmTask(xmTaskDb.getParentTaskid()));
+						if(xmTaskParentDb!=null){
+							if(!"1".equals(xmTaskParentDb.getNtype())){
+								ResponseHelper.failed("ptask-ntype-0","上级任务"+xmTaskParentDb.getName()+"属于不是任务集,不能下挂任务集");
+							}
+						}
+					}
+				}
+			}
 			BigDecimal taskBudgetCost=BigDecimal.ZERO;
 			BigDecimal taskBudgetInnerUserAt=BigDecimal.ZERO;
 			BigDecimal taskBudgetOutUserAt=BigDecimal.ZERO;