From 867e23e2af98e3af4aa493779e4c1881679f81ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 13 Jun 2021 20:53:47 +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 --- .../main/java/com/xm/core/ctrl/XmTestCaseController.java | 1 + .../java/com/xm/core/ctrl/XmTestCaseExecController.java | 6 +++--- .../mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml | 3 +++ 3 files changed, 7 insertions(+), 3 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 4dd7d368..65d3abe5 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 @@ -73,6 +73,7 @@ public class XmTestCaseController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmTestCase, "ids"); + RequestUtils.transformArray(xmTestCase, "menuIds"); PageUtils.startPage(xmTestCase); String id= (String) xmTestCase.get("id"); String menuId= (String) xmTestCase.get("menuId"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java index c9bba8ab..ed6b043a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java @@ -5,6 +5,7 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmTestCaseExec; import com.xm.core.service.XmTestCaseExecService; import io.swagger.annotations.*; @@ -77,6 +78,7 @@ public class XmTestCaseExecController { public Map listXmTestCaseExec( @RequestParam Map xmTestCaseExec){ Map m = new HashMap<>(); RequestUtils.transformArray(xmTestCaseExec, "ids"); + RequestUtils.transformArray(xmTestCaseExec, "menuIds"); PageUtils.startPage(xmTestCaseExec); Tips tips=new Tips("查询成功"); String id= (String) xmTestCaseExec.get("id"); @@ -87,9 +89,7 @@ public class XmTestCaseExecController { String productId= (String) xmTestCaseExec.get("productId"); String caseId= (String) xmTestCaseExec.get("caseId"); if( !( StringUtils.hasText(caseId)||StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(projectId)|| StringUtils.hasText(productId)||menuIds!=null||ids!=null ) ){ - tips.setFailureMsg("产品编号productId、故事编号列表menuIds、故事编号menuId、项目编号projectId、测试用例编号caseId必传任意一个"); - m.put("tips", tips); - return m; + xmTestCaseExec.put("compete", LoginUtils.getCurrentUserInfo().getUserid()); } List> xmTestCaseExecList = xmTestCaseExecService.selectListMapByWhere(xmTestCaseExec); //列出XmTestCaseExec列表 PageUtils.responePage(m, xmTestCaseExecList); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml index 81c7a1e6..33126119 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml @@ -40,6 +40,9 @@ #{item} + + and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id ) + and exists( select 1 from xm.xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId}) and res.case_name like #{key}