mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-05 05:29:29 +08:00
fix(接口测试): 修复场景列表添加到测试计划列表页搜索和高级搜索无效的缺陷
--bug=1027130 --user=王孝刚 【接口测试】场景列表-批量操作-添加到测试计划-按名称搜索计划和高级搜索无效 https://www.tapd.cn/55049933/s/1383008
This commit is contained in:
parent
cee01f2a0c
commit
dec0d8ad9a
@ -413,11 +413,42 @@
|
||||
(select name from user where user.id = test_plan.creator) as userName
|
||||
from test_plan
|
||||
JOIN project on project.id = test_plan.project_id
|
||||
<if test="request.executorOrPrincipal != null">
|
||||
LEFT JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
|
||||
LEFT JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
|
||||
</if>
|
||||
<where>
|
||||
<if test="request.combine != null">
|
||||
<include refid="combine">
|
||||
<property name="condition" value="request.combine"/>
|
||||
<property name="name" value="request.name"/>
|
||||
<property name="objectKey" value="request.combine.tags"/>
|
||||
</include>
|
||||
</if>
|
||||
<if test="request.name != null">
|
||||
and test_plan.name like CONCAT('%', #{request.name},'%')
|
||||
</if>
|
||||
<if test="request.workspaceId != null">
|
||||
AND test_plan.workspace_id = #{request.workspaceId}
|
||||
</if>
|
||||
<if test="request.projectId != null">
|
||||
AND test_plan.project_id = #{request.projectId}
|
||||
</if>
|
||||
<if test="request.id != null">
|
||||
AND test_plan.id = #{request.id}
|
||||
</if>
|
||||
<include refid="filter"/>
|
||||
<if test="(request.filters == null or request.filters.size() == 0) and request.byFilter != true ">
|
||||
and test_plan.status != 'Archived'
|
||||
</if>
|
||||
</where>
|
||||
|
||||
<if test="request.orders != null and request.orders.size() > 0">
|
||||
order by
|
||||
<foreach collection="request.orders" separator="," item="order">
|
||||
test_plan.${order.name} ${order.type}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
<update id="updateStatusAndActStartTimeAndSetActEndTimeNullById">
|
||||
update test_plan
|
||||
|
Loading…
Reference in New Issue
Block a user