From f86abb0a33bcd0faff758a69b7ebb8e1b9407a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 28 Jan 2023 21:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/ctrl/XmTestCaseController.java    |  3 +-
 .../core/ctrl/XmTestPlanCaseController.java   | 54 +++++++++++--------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
index 24dc1f43..5e1be840 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
@@ -294,8 +294,7 @@ public class XmTestCaseController {
 				 can=xmTestCasesDb;
 			}else{
 				for (XmTestCase xmTestCaseDb : xmTestCasesDb) {
-					Tips tips2 = new Tips("检查通过");
-					tips2=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null);
+					Tips tips2 = productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null);
 					if(!tips2.isOk()){
 						no.add(xmTestCaseDb);
 						noTipsMap.put(tips2.getMsg(),tips2);
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
index 9972b043..b0fcfd8c 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
@@ -388,19 +388,27 @@ public class XmTestPlanCaseController {
 			XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanCaseDb.getProductId());
 			if(xmProductDb==null){
 				return failed("product-not-exists","产品已不存在");
-			} 
-			tips=productQxService.checkProductQx(xmProductDb,1,user);
+			}
+			if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){
+				tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null);
+			}else {
+				tips=productQxService.checkProductQx(xmProductDb,1,user);
+			}
 			if(!tips.isOk()){
 				return failed(tips);
 			}
-			for (XmTestPlanCase pcDb : xmTestPlanCasesDb) {
-				Tips tips2 = new Tips("成功");
-				tips2=productQxService.checkProductQx(xmProductDb,1,user,pcDb.getExecUserid(),pcDb.getExecUsername(),null);
-				if(!tips2.isOk()){
-				    no.add(xmTestPlanCaseDb);
-					noTipsSet.add(tips2.getMsg());
-				}else{
-					can.add(xmTestPlanCaseDb);
+			boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
+			if(isPm){
+				can=xmTestPlanCasesDb;
+			}else {
+				for (XmTestPlanCase pcDb : xmTestPlanCasesDb) {
+					Tips tips2  = productQxService.checkProductQx(xmProductDb, 1, user, pcDb.getExecUserid(), pcDb.getExecUsername(), null);
+					if (!tips2.isOk()) {
+						no.add(xmTestPlanCaseDb);
+						noTipsSet.add(tips2.getMsg());
+					} else {
+						can.add(xmTestPlanCaseDb);
+					}
 				}
 			}
 			if(can.size()>0){
@@ -458,19 +466,21 @@ public class XmTestPlanCaseController {
 			if(xmProductDb==null){
 				return failed("product-not-exists","产品已不存在");
 			}
-			tips=productQxService.checkProductQx(xmProductDb,1,user);
-			if(!tips.isOk()){
-				return failed(tips);
+			boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
+			if(isPm){
+				can=datasDb;
+			}else {
+				for (XmTestPlanCase pcDb : datasDb) {
+					Tips tips1=productQxService.checkProductQx(xmProductDb,1,user,pcDb.getExecUserid(),pcDb.getExecUsername(),null);
+					if(tips1.isOk()){
+						can.add(pcDb);
+					}else{
+						no.add(pcDb);
+						noTipsSet.add(tips1.getMsg());
+					}
+				}
 			}
-            for (XmTestPlanCase pcDb : datasDb) {
-				Tips tips1=productQxService.checkProductQx(xmProductDb,1,user,pcDb.getExecUserid(),pcDb.getExecUsername(),null);
-				if(tips1.isOk()){
-                    can.add(pcDb);
-                }else{
-                    no.add(pcDb);
-					noTipsSet.add(tips1.getMsg());
-                } 
-            }
+
             List<String> msgs=new ArrayList<>();
             if(can.size()>0){
                 xmTestPlanCaseService.batchDelete(can);