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

fix(测试用例): 回收站用例无法恢复问题 

--bug=1047305 --user=王旭 【测试用例】-用例回收站无法恢复用例 https://www.tapd.cn/55049933/s/1588140
This commit is contained in:
WangXu10 2024-09-29 13:46:41 +08:00 committed by Craftsman
parent b97a4e2c5e
commit 4baf4fc042
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ public class ServiceUtils {
if (MapUtils.isNotEmpty(request.getCombine()) && ObjectUtils.isNotEmpty((request.getCombine().get("customs")))) {
List<Map<String, Object>> customs = (List<Map<String, Object>>) request.getCombine().get("customs");
customs.forEach(custom -> {
if(StringUtils.equalsIgnoreCase(custom.get("operator").toString(), "current user")){
if (StringUtils.equalsIgnoreCase(custom.get("operator").toString(), "current user")) {
String userId = SessionUtils.getUserId();
custom.put("value", userId);
}
@ -490,7 +490,7 @@ public class ServiceUtils {
}
public static void buildCombineTagsToSupportMultiple(BaseQueryRequest request) {
if (request.getCombine() != null && request.getCombine().containsKey("tags")) {
if (request != null && request.getCombine() != null && request.getCombine().containsKey("tags")) {
Map<String, Object> tagsMap = (Map<String, Object>) request.getCombine().get("tags");
Object tagVal = tagsMap.get("value");
if (tagVal != null) {