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

fix(接口定义): 修复添加后置脚本不触发通知的缺陷 

--bug=1026591 --user=王孝刚 【接口测试】接口自动化-场景内接口有一个前置脚本-添加一个后置脚本-未发送通知
https://www.tapd.cn/55049933/s/1377090
This commit is contained in:
wxg0103 2023-05-30 16:32:35 +08:00 committed by fit2-zhao
parent f484aa3d43
commit 8f464917ce
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
View File

@ -1151,14 +1151,18 @@ public class ElementUtil {
} }
public static boolean isSend(List<String> org, List<String> target) { public static boolean isSend(List<String> org, List<String> target) {
if (org.size() != target.size() && CollectionUtils.isEmpty(org)) { if (org.size() != target.size()) {
if (CollectionUtils.isEmpty(org)) {
return true; return true;
} }
if (org.size() != target.size() && CollectionUtils.isEmpty(target)) { if (CollectionUtils.isEmpty(target)) {
return false; return false;
} }
List<String> diff = org.stream() return true;
.filter(s -> !target.contains(s))
}
List<String> diff = target.stream()
.filter(s -> !org.contains(s))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(diff)) { if (CollectionUtils.isNotEmpty(diff)) {
return true; return true;

9
framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/BaseEnvironmentService.java
View File

@ -1125,13 +1125,16 @@ public class BaseEnvironmentService extends NodeTreeService<ApiModuleDTO> {
public static boolean isSend(List<String> orgList, List<String> targetList) { public static boolean isSend(List<String> orgList, List<String> targetList) {
if (orgList.size() != targetList.size() && CollectionUtils.isEmpty(orgList)) { if (orgList.size() != targetList.size() && CollectionUtils.isEmpty(orgList)) {
if (CollectionUtils.isEmpty(orgList)) {
return true; return true;
} }
if (orgList.size() != targetList.size() && CollectionUtils.isEmpty(targetList)) { if (CollectionUtils.isEmpty(targetList)) {
return false; return false;
} }
List<String> diff = orgList.stream() return true;
.filter(s -> !targetList.contains(s)) }
List<String> diff = targetList.stream()
.filter(s -> !orgList.contains(s))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(diff)) { if (CollectionUtils.isNotEmpty(diff)) {
return true; return true;