test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(工作台): 解决我的待办接口用例待更新列表查询报错问题 

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-10-26 20:15:51 +08:00 committed by xiaomeinvG
parent 9741084941
commit e868f143be
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
View File

@ -527,23 +527,23 @@
<if test="request.filters == null || request.filters.size() == 0 "> <if test="request.filters == null || request.filters.size() == 0 ">
and (t1.status is null or t1.status != 'Trash') and (t1.status is null or t1.status != 'Trash')
</if> </if>
<if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.statusList.size() > 0"> <if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.statusList !=null and request.statusList.size() > 0">
and ( t1.to_be_updated = #{request.toBeUpdated} or t1.status and ( t1.to_be_updated = #{request.toBeUpdated} or t1.status
in <foreach collection="request.statusList" item="value" separator="," open="(" close=")"> in <foreach collection="request.statusList" item="value" separator="," open="(" close=")">
#{value} #{value}
</foreach>) </foreach>)
</if> </if>
<if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.statusList.size() == 0"> <if test="request.toBeUpdated !=null and request.toBeUpdated == true and (request.statusList ==null or request.statusList.size() == 0)">
and t1.to_be_updated = #{request.toBeUpdated} and t1.to_be_updated = #{request.toBeUpdated}
</if> </if>
<if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.toBeUpdateTime !=null and request.statusList.size() > 0"> <if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.toBeUpdateTime !=null and request.statusList !=null and request.statusList.size() > 0">
and (t1.to_be_update_time >= #{request.toBeUpdateTime} or ( t1.status in and (t1.to_be_update_time >= #{request.toBeUpdateTime} or ( t1.status in
<foreach collection="request.statusList" item="value" separator="," open="(" close=")"> <foreach collection="request.statusList" item="value" separator="," open="(" close=")">
#{value} #{value}
</foreach> </foreach>
and t1.update_time>= #{request.updateTime} )) and t1.update_time>= #{request.updateTime} ))
</if> </if>
<if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.toBeUpdateTime !=null and request.statusList.size() == 0"> <if test="request.toBeUpdated !=null and request.toBeUpdated == true and request.toBeUpdateTime !=null and (request.statusList ==null or request.statusList.size() == 0)">
and t1.to_be_update_time >= #{request.toBeUpdateTime} and t1.to_be_update_time >= #{request.toBeUpdateTime}
</if> </if>
<include refid="queryVersionCondition"> <include refid="queryVersionCondition">

6
framework/sdk-parent/frontend/src/components/MsInputTag.vue
View File

@ -36,7 +36,7 @@ export default {
placeholder: { placeholder: {
type: String, type: String,
}, },
errorInfor: String, errorInfo: String,
addTagOnKeys: { addTagOnKeys: {
type: Array, type: Array,
default: () => [13, 188, 9] default: () => [13, 188, 9]
@ -119,8 +119,8 @@ export default {
this.innerTags.push(tag) this.innerTags.push(tag)
return true return true
} else { } else {
if (tag !== "" && this.errorInfor) { if (tag !== "" && this.errorInfo) {
this.$error(this.errorInfor); this.$error(this.errorInfo);
} }
} }
return false return false