mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-02 03:58:33 +08:00
typos: backed spell check
This commit is contained in:
parent
ded906fc5e
commit
0b85f941ec
@ -1,6 +1,6 @@
|
||||
package io.metersphere.plugin.platform.dto;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugDTO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -1,6 +1,6 @@
|
||||
package io.metersphere.plugin.platform.dto.request;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.reponse.TestCaseDemandDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.TestCaseDemandDTO;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
package io.metersphere.plugin.platform.dto.request;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformStatusDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformStatusDTO;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
package io.metersphere.plugin.platform.dto.request;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugDTO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package io.metersphere.plugin.platform.dto.request;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.PlatformAttachment;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugDTO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package io.metersphere.plugin.platform.dto.reponse;
|
||||
package io.metersphere.plugin.platform.dto.response;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
@ -2,10 +2,10 @@ package io.metersphere.plugin.platform.spi;
|
||||
|
||||
import io.metersphere.plugin.platform.dto.SelectOption;
|
||||
import io.metersphere.plugin.platform.dto.SyncBugResult;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugUpdateDTO;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformCustomFieldItemDTO;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.dto.request.*;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugUpdateDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformCustomFieldItemDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.utils.PluginPager;
|
||||
import org.pf4j.ExtensionPoint;
|
||||
|
||||
|
@ -13,10 +13,10 @@ import io.metersphere.bug.mapper.*;
|
||||
import io.metersphere.bug.utils.ExportUtils;
|
||||
import io.metersphere.plugin.platform.dto.SelectOption;
|
||||
import io.metersphere.plugin.platform.dto.SyncBugResult;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformBugUpdateDTO;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformCustomFieldItemDTO;
|
||||
import io.metersphere.plugin.platform.dto.request.*;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformBugUpdateDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformCustomFieldItemDTO;
|
||||
import io.metersphere.plugin.platform.enums.PlatformCustomFieldType;
|
||||
import io.metersphere.plugin.platform.enums.SyncAttachmentType;
|
||||
import io.metersphere.plugin.platform.spi.Platform;
|
||||
@ -836,10 +836,10 @@ public class BugService {
|
||||
bugContent.setDescription(StringUtils.isEmpty(request.getDescription()) ? StringUtils.EMPTY : request.getDescription());
|
||||
bugContentMapper.insert(bugContent);
|
||||
} else {
|
||||
Bug orignalBug = checkBugExist(request.getId());
|
||||
Bug originalBug = checkBugExist(request.getId());
|
||||
// 追加处理人
|
||||
if (!StringUtils.equals(orignalBug.getHandleUser(), bug.getHandleUser())) {
|
||||
bug.setHandleUsers(orignalBug.getHandleUsers() + "," + bug.getHandleUser());
|
||||
if (!StringUtils.equals(originalBug.getHandleUser(), bug.getHandleUser())) {
|
||||
bug.setHandleUsers(originalBug.getHandleUsers() + "," + bug.getHandleUser());
|
||||
}
|
||||
bug.setUpdateUser(currentUser);
|
||||
bug.setUpdateTime(System.currentTimeMillis());
|
||||
|
Binary file not shown.
@ -9,7 +9,7 @@ import io.metersphere.functional.request.FunctionalThirdDemandPageRequest;
|
||||
import io.metersphere.functional.request.QueryDemandListRequest;
|
||||
import io.metersphere.functional.service.FunctionalCaseDemandService;
|
||||
import io.metersphere.functional.service.FunctionalCaseLogService;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.utils.PluginPager;
|
||||
import io.metersphere.sdk.constants.PermissionConstants;
|
||||
import io.metersphere.system.log.annotation.Log;
|
||||
|
@ -10,8 +10,8 @@ import io.metersphere.functional.mapper.ExtFunctionalCaseMapper;
|
||||
import io.metersphere.functional.mapper.FunctionalCaseDemandMapper;
|
||||
import io.metersphere.functional.mapper.FunctionalCaseMapper;
|
||||
import io.metersphere.functional.request.*;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.dto.request.DemandPageRequest;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.spi.Platform;
|
||||
import io.metersphere.plugin.platform.utils.PluginPager;
|
||||
import io.metersphere.project.service.ProjectApplicationService;
|
||||
|
@ -7,7 +7,7 @@ import io.metersphere.functional.dto.FunctionalDemandDTO;
|
||||
import io.metersphere.functional.mapper.FunctionalCaseDemandMapper;
|
||||
import io.metersphere.functional.request.*;
|
||||
import io.metersphere.functional.service.FunctionalCaseDemandService;
|
||||
import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO;
|
||||
import io.metersphere.plugin.platform.utils.PluginPager;
|
||||
import io.metersphere.sdk.constants.SessionConstants;
|
||||
import io.metersphere.sdk.domain.OperationLog;
|
||||
|
@ -96,10 +96,10 @@ public class CustomFieldUtils {
|
||||
if (StringUtils.isEmpty(originalVal)) {
|
||||
return appendVal;
|
||||
}
|
||||
List<String> orignalList = JSON.parseArray(originalVal, String.class);
|
||||
List<String> originalList = JSON.parseArray(originalVal, String.class);
|
||||
List<String> appendList = JSON.parseArray(appendVal, String.class);
|
||||
orignalList.addAll(appendList);
|
||||
originalList.addAll(appendList);
|
||||
// 追加后需去重
|
||||
return JSON.toJSONString(orignalList.stream().distinct().toList());
|
||||
return JSON.toJSONString(originalList.stream().distinct().toList());
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user