From 45db032243ed906d3864550853e827b6c32cbf5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 12 Apr 2023 23:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/ctrl/XmQuestionController.java    |  2 +-
 .../xm/core/ctrl/XmTestCasedbController.java  | 24 ++++++++++++++++---
 .../xm/core/service/XmTestCasedbService.java  | 12 ++++------
 .../mapper/xm/core/dao/XmTestCasedbMapper.xml | 13 +++++++++-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
index bb0c035c..e6d4f87a 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
@@ -381,7 +381,7 @@ public class XmQuestionController {
 							return ResponseHelper.failed(fieldName+"-no-edit",fieldName+"不允许修改");
 						}
 					}
-					if(xmQuestionMap.containsKey("handlerUserid")){
+					if(StringUtils.hasText(xmQuestionsDb.get(0).getProductId()) && xmQuestionMap.containsKey("handlerUserid")){
 						String handlerUserid= (String) xmQuestionMap.get("handlerUserid");
 						String handlerUsername= (String) xmQuestionMap.get("handlerUsername");
 						XmQuestion xmQuedb=canOper.get(0);
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
index 8b1c7f5a..2582bef1 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
@@ -349,20 +349,38 @@ public class XmTestCasedbController {
 					}
 				}
 			}
-
+			if(can.size()>0){
+				List<XmTestCasedb> can2=new ArrayList<>();
+ 				List<String> existsPlanCasedbIds=this.xmTestCasedbService.getExistsPlanCasedbIds(can.stream().map(k->k.getId()).collect(Collectors.toList()));
+				if(existsPlanCasedbIds.size()>0){
+					for (XmTestCasedb xmTestCasedb : can) {
+						if(existsPlanCasedbIds.stream().filter(k->k.equals(xmTestCasedb.getId())).findAny().isPresent()){
+							no.add(xmTestCasedb);
+							noTips.add(xmTestCasedb.getName()+"存在测试计划，请先删除测试计划");
+						}else{
+							can2.add(xmTestCasedb);
+						}
+					}
+					can=can2;
+				}
+			}
             List<String> msgs=new ArrayList<>();
             if(can.size()>0){
                 xmTestCasedbService.batchDelete(can);
                 msgs.add(String.format("成功删除%s条数据.",can.size()));
             }
+
     
             if(no.size()>0){ 
                 msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(","))));
             }
+			if(noTips.size()>0){
+				msgs.add(noTips.stream().collect(Collectors.joining(";")));
+			}
             if(can.size()>0){
-                 tips.setOkMsg(msgs.stream().collect(Collectors.joining()));
+                 tips.setOkMsg(msgs.stream().collect(Collectors.joining(";")));
             }else {
-                tips.setFailureMsg(msgs.stream().collect(Collectors.joining()));
+                tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";")));
             }
         }catch (BizException e) { 
             tips=e.getTips();
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
index 76e38492..6c1e6847 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
@@ -1,16 +1,11 @@
 package com.xm.core.service;
 
+import com.mdp.core.service.BaseService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
 import org.springframework.stereotype.Service;
-import com.mdp.core.service.BaseService;
-import static com.mdp.core.utils.BaseUtils.*;
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
 
-import com.xm.core.entity.XmTestCasedb;
+import java.util.List;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -20,5 +15,8 @@ import com.xm.core.entity.XmTestCasedb;
 public class XmTestCasedbService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmTestCasedbService.class);
 
+    public List<String> getExistsPlanCasedbIds(List<String> casedbIds) {
+        return super.selectList("getExistsPlanCasedbIds",casedbIds);
+    }
 }
 
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml
index 62751fa9..7b48bedb 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCasedbMapper.xml
@@ -14,7 +14,18 @@
         <if test="key != null and key !='' "> and res.name like  concat('%',#{key},'%')    </if>
     </sql>
 
-
+	<select id="getExistsPlanCasedbIds" parameterType="List" resultType="String">
+ 		select id from xm_test_casedb res where exists(select 1 from xm_test_plan p where p.casedb_id=res.id
+			and p.casedb_id in
+			<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+				#{item}
+			</foreach>
+			)
+		and id in
+		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+			#{item}
+		</foreach>
+	</select>
 	<!--结束 自定义sql函数区域-->