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

fix(测试跟踪)：缺陷管理-高级搜索-禅道影响版本查询条件不生效 

--bug=1021230 --user=王旭 【测试跟踪】缺陷管理-高级搜索-禅道影响版本-不属于-筛选数据不对 https://www.tapd.cn/55049933/s/1345956
This commit is contained in:
WangXu10 2023-03-07 14:44:01 +08:00 committed by jianxing
parent 35364998a3
commit 370e8ab17c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/constants/OperatorTypeConstants.java Normal file
View File

@ -0,0 +1,5 @@
package io.metersphere.commons.constants;
public class OperatorTypeConstants {
public static final String NOT_IN = "not in";
}

10
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/ServiceUtils.java
View File

@ -4,6 +4,7 @@ import io.metersphere.base.domain.Project;
import io.metersphere.base.domain.User;
import io.metersphere.base.domain.Workspace;
import io.metersphere.commons.constants.CustomFieldType;
import io.metersphere.commons.constants.OperatorTypeConstants;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.JSON;
@ -384,9 +385,16 @@ public class ServiceUtils {
CustomFieldType.CHECKBOX.getValue(), CustomFieldType.MULTIPLE_SELECT.getValue())
&& StringUtils.isNotEmpty(custom.get("value").toString())) {
List<String> customValues = JSON.parseArray(custom.get("value").toString(), String.class);
List<String> jsonValues = customValues.stream().map(item -> "JSON_CONTAINS(`value`, '[\"".concat(item).concat("\"]')")).collect(Collectors.toList());
List<String> jsonValues;
if (StringUtils.equalsIgnoreCase(custom.get("operator").toString(), OperatorTypeConstants.NOT_IN)) {
jsonValues = customValues.stream().map(item -> "locate('"+item+"',`value`) = 0").collect(Collectors.toList());
custom.put("value", "(".concat(StringUtils.join(jsonValues, " and ")).concat(")"));
} else {
jsonValues = customValues.stream().map(item -> "JSON_CONTAINS(`value`, '[\"".concat(item).concat("\"]')")).collect(Collectors.toList());
custom.put("value", "(".concat(StringUtils.join(jsonValues, " OR ")).concat(")"));
}
}
});
}
}