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> 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} + and res.create_time > #{createTimeStart} + and res.create_time < #{createTimeEnd} + and exists( select 1 from xm.xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId}) and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) 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 @@ and res.ctime > #{ctimeStart} and res.ctime < #{ctimeTimeEnd} + and (res.luserid=#{myUserid} or res.cuserid=#{myUserid}) and (res.luserid=#{compete} or res.cuserid=#{compete}) and res.menu_id in