添加节点类型、标签等

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

@@ -255,31 +255,28 @@ public class XmProductController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功删除一条数据");
 		try{
-			long projects=xmProductService.checkExistsProject(xmProduct.getId());
-			User user=LoginUtils.getCurrentUserInfo();
-			if(projects>0) {
-				tips.setFailureMsg("该产品有"+projects+"个项目关联，不允许删除，请先解绑项目");
-			}else {
-				 XmProduct xmProductDb=xmProductService.selectOneObject(new XmProduct(xmProduct.getId()));
-				 if(xmProductDb==null){
-				 	return ResponseHelper.failed("data-0","产品已不存在");
-				 }else if(!"0".equals(xmProductDb.getPstatus())&&!"3".equals(xmProductDb.getPstatus())){
-					 return ResponseHelper.failed("pstatus-not-0-3","该产品不是初始、已关闭状态，不允许删除");
-				 }else if(!user.getBranchId().equals(xmProductDb.getBranchId())){
-					 return ResponseHelper.failed("branchId-not-right","该产品不属于您所在的机构，不允许删除");
-				 }else if(!user.getUserid().equals(xmProductDb.getPmUserid()) && !user.getUserid().equals(xmProductDb.getAssistantUserid())){
-					 return ResponseHelper.failed("pmUserid-not-right","您不是该产品产品负责人,也不是产品助理，不允许删除");
-				 }
-				 if(!"1".equals(xmProductDb.getIsTpl())){
-					 long menus=xmProductService.checkExistsMenu(xmProduct.getId());
-					 if(menus>0) {
-						 return ResponseHelper.failed("had-menus","该产品有"+menus+"个需求关联，不允许删除，请先解绑需求");
+			if(!StringUtils.hasText(xmProduct.getId())){
+				return ResponseHelper.failed("id-0","","产品编号不能为空");
+			}
+ 			User user=LoginUtils.getCurrentUserInfo();
+			 XmProduct xmProductDb=xmProductService.selectOneObject(new XmProduct(xmProduct.getId()));
+			 if(xmProductDb==null){
+				return ResponseHelper.failed("data-0","产品已不存在");
+			 }else if(!"0".equals(xmProductDb.getPstatus())&&!"3".equals(xmProductDb.getPstatus())){
+				 return ResponseHelper.failed("pstatus-not-0-3","该产品不是初始、已关闭状态，不允许删除");
+			 }else if(!user.getBranchId().equals(xmProductDb.getBranchId())){
+				 return ResponseHelper.failed("branchId-not-right","该产品不属于您所在的机构，不允许删除");
+			 }else if(!user.getUserid().equals(xmProductDb.getPmUserid()) && !user.getUserid().equals(xmProductDb.getAssistantUserid())){
+				 return ResponseHelper.failed("pmUserid-not-right","您不是该产品产品负责人,也不是产品助理，不允许删除");
+			 }
+			 if(!"1".equals(xmProductDb.getIsTpl())){
+				 long menus=xmProductService.checkExistsMenu(xmProduct.getId());
+				 if(menus>0) {
+					 return ResponseHelper.failed("had-menus","该产品有"+menus+"个需求关联，不允许删除，请先解绑需求");
 
-					 }
 				 }
-				 xmProductService.deleteByPk(xmProduct);
-
-			}
+			 }
+			 xmProductService.deleteByPk(xmProduct);
 		}catch (BizException e) { 
 			tips=e.getTips();
 			logger.error("",e);
@@ -331,13 +328,17 @@ public class XmProductController {
 		Tips tips=new Tips("成功删除"+xmProducts.size()+"条数据"); 
 		try{
 			User user=LoginUtils.getCurrentUserInfo();
-			List<String> hasProjects=new ArrayList<>();
-			List<String> hasMenus=new ArrayList<>();
-			List<XmProduct> canDelList=new ArrayList<>();
+ 			List<XmProduct> canDelList=new ArrayList<>();
 			List<Tips> errTips=new ArrayList<>();
 			for (XmProduct xmProduct : xmProducts) {
-				XmProduct xmProductDb=xmProductService.selectOneObject(new XmProduct(xmProduct.getId()));
 				Tips otips=new Tips();
+				if(!StringUtils.hasText(xmProduct.getId())){
+					otips.setFailureMsg("id-0","","产品编号不能为空");
+					errTips.add(otips);
+					continue;
+				}
+				XmProduct xmProductDb=xmProductService.selectOneObject(new XmProduct(xmProduct.getId()));
+
 				if(xmProductDb==null){
 					otips.setFailureMsg("data-0","","产品【"+xmProductDb.getProductName()+"】已不存在");
 				}else if(!"0".equals(xmProductDb.getPstatus())&&!"3".equals(xmProductDb.getPstatus())){
@@ -350,7 +351,6 @@ public class XmProductController {
 					if(!"1".equals(xmProductDb.getIsTpl())){
 						long menus=xmProductService.checkExistsMenu(xmProduct.getId());
 						if(menus>0) {
-							hasMenus.add(xmProduct.getProductName());
 							otips.setFailureMsg("had-menus","产品【"+xmProductDb.getProductName()+"】有"+menus+"个需求关联，不允许删除，请先解绑需求");
 						}
 					}