From 58ef9da458ee6f4af062f4e8745f89cb2219d6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 21 Feb 2022 16:03:40 +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/XmProductController.java | 26 ++++++++++++++-----
 .../com/xm/core/service/XmProductService.java |  1 +
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
index c822481d..3d64954a 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
@@ -255,16 +255,28 @@ public class XmProductController {
 		Tips tips=new Tips("成功删除一条数据");
 		try{
 			long projects=xmProductService.checkExistsProject(xmProduct.getId());
-			
+			User user=LoginUtils.getCurrentUserInfo();
 			if(projects>0) {
 				tips.setFailureMsg("该产品有"+projects+"个项目关联，不允许删除，请先解绑项目");
 			}else {
-				long menus=xmProductService.checkExistsMenu(xmProduct.getId());
-				if(menus>0) {
-					tips.setFailureMsg("该产品有"+menus+"个故事关联，不允许删除，请先解绑故事");
-				}else { 
-					xmProductService.deleteByPk(xmProduct);
-				}
+				 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);
 
 			}
 		}catch (BizException e) { 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
index 85ac7599..428ed566 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
@@ -82,6 +82,7 @@ public class XmProductService extends BaseService {
 		xmProductTo.setPmUserid(user.getUserid());
 		xmProductTo.setPmUsername(user.getUsername());
 		xmProductTo.setCtime(new Date());
+		xmProductTo.setPstatus("0");
 		xmProductTo.setAssistantUserid(user.getUserid());
 		xmProductTo.setAssistantUsername(user.getUsername());
 		if(xmProduct.getProductName().equals(xmProductDb.getProductName())){