添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -348,16 +348,14 @@ public class XmMenuController {
 			if(!groupService.calcCanOpMenus(xmMenuDb)){
 				return ResponseHelper.failed("noqx","您无权修改此需求。");
 			}
-			if(StringUtils.hasText(xmMenu.getNtype())&&StringUtils.hasText(xmMenu.getNtype())&&StringUtils.hasText(xmMenuDb.getPmenuId())){
-				if(!xmMenuDb.getNtype().equals(xmMenu.getNtype())){
-					if(xmMenu.getNtype().equals("1")){
-						XmMenu xmMenuParentDb=this.xmMenuService.selectOneObject(new XmMenu(xmMenuDb.getPmenuId()));
-						if(xmMenuParentDb!=null){
-							if(!"1".equals(xmMenuParentDb.getNtype())){
-								ResponseHelper.failed("pmenu-ntype-0","上级需求"+xmMenuParentDb.getMenuName()+"不是需求池,不能下挂需求池");
-							}
-						}
-					}
+
+			if("1".equals(xmMenuDb.getNtype())){
+				if("0".equals(xmMenu.getNtype()) && xmMenuDb.getChildrenCnt()!=null && xmMenuDb.getChildrenCnt()>0){
+					return ResponseHelper.failed("ntype-not-right","当前为需求池，并且具有"+xmMenuDb.getChildrenCnt()+"个子需求池或子需求，不能变更为需求");
+				}
+			}else{
+				if(xmMenuDb.getChildrenCnt()!=null && xmMenuDb.getChildrenCnt()>0){
+					xmMenu.setNtype("1");
 				}
 			}
 			xmMenuService.updateByPk(xmMenu);

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -492,7 +492,7 @@ public class XmTaskController {
 		return m;
 	}
 
-	@ApiOperation( value = "根据主键修改一条xm_task信息",notes="editXmTask")
+	@ApiOperation( value = "根据主键修改一条xm_task信息",notes="setTaskCreateUser")
 	@ApiResponses({
 			@ApiResponse(code = 200,response=XmTask.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
 	})