Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -993,7 +993,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
Assert.notEmpty(details, "Some errors occurred, please restart the design");
|
Assert.notEmpty(details, "Some errors occurred, please restart the design");
|
||||||
details.forEach(detail -> {
|
details.forEach(detail -> {
|
||||||
List<Long> offset = new ArrayList<>();
|
List<Long> offset = new ArrayList<>();
|
||||||
if (detail.getOffset().equals("null")){
|
if (StringUtil.isNullOrEmpty(detail.getOffset()) || detail.getOffset().equals("null")){
|
||||||
offset = Arrays.asList(0L,0L);
|
offset = Arrays.asList(0L,0L);
|
||||||
}else {
|
}else {
|
||||||
offset = Arrays.stream(detail.getOffset().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
offset = Arrays.stream(detail.getOffset().replaceAll("\\[|\\]", "").split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
||||||
|
|||||||
Reference in New Issue
Block a user