From ef00594d6bd50a8e47ee0e9132cf3ae7d1e849a0 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, 14 Jun 2021 09:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E3=80=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=A7=E8=A1=8C=E5=A2=9E=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E6=95=85=E4=BA=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E6=8C=89=E4=BA=A7=E5=93=81=E6=9F=A5=E8=AF=A2=E3=80=81=E6=8C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/ctrl/XmTestCaseController.java   | 3 ++-
 .../resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml  | 3 +++
 .../resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

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 1f12ae68..4a3234b2 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
@@ -81,8 +81,9 @@ public class XmTestCaseController {
 		Object ids=  xmTestCase.get("ids");
 		Object menuIds=  xmTestCase.get("menuIds");
 		String productId= (String) xmTestCase.get("productId");
+		String myUserid= (String) xmTestCase.get("myUserid");
 		String projectId= (String) xmTestCase.get("projectId");
-		if(   !( StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(projectId)||menuIds!=null||ids!=null  ) ){
+		if(   !( StringUtils.hasText(myUserid) ||StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(projectId)||menuIds!=null||ids!=null  ) ){
 			xmTestCase.put("compete", LoginUtils.getCurrentUserInfo().getUserid());
 		}
 		List<Map<String,Object>>	xmTestCaseList = xmTestCaseService.selectListMapByWhere(xmTestCase);	//列出XmTestCase列表
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
index 33a53210..68b5bca8 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
@@ -67,7 +67,10 @@
 				        #{item}  
 				    </foreach>  
 			 </if>
+			<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
+			<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
 			<include refid="where"/>
+			<if test=" productId !=null and productId!='' "> and exists( select 1 from xm.xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId}) </if>
 			<if test="myUserid != null and myUserid != ''"> and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) </if>
 			<if test="menuIds != null">  and
 				res.menu_id in
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
index 07cf1979..6a2b5949 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
@@ -26,6 +26,7 @@
 			<if test=" ctimeStart !=null "> and res.ctime &gt; #{ctimeStart} </if>
 			<if test=" ctimeTimeEnd !=null "> and res.ctime &lt; #{ctimeTimeEnd} </if>
 			<include refid="where"/>
+			<if test=" myUserid!=null and myUserid!='' "> and (res.luserid=#{myUserid} or res.cuserid=#{myUserid})</if>
 			<if test=" compete!=null and compete!='' "> and (res.luserid=#{compete} or res.cuserid=#{compete})</if>
 			<if test="menuIds != null">  and
 				res.menu_id in