|
@@ -473,10 +473,10 @@ public class WpsController extends BaseSystemController {
|
|
if (Objects.nonNull(type) && Objects.equals(type.trim(), "text")) {
|
|
if (Objects.nonNull(type) && Objects.equals(type.trim(), "text")) {
|
|
Set<String> set = this.replaceHtmlTag(value, "p");
|
|
Set<String> set = this.replaceHtmlTag(value, "p");
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
- set.addAll(this.replaceHtmlTag(value, "div"));
|
|
|
|
|
|
+ set = this.replaceHtmlTag(value, "div");
|
|
}
|
|
}
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
- set.addAll(this.replaceHtmlTag(value, "span"));
|
|
|
|
|
|
+ set = this.replaceHtmlTag(value, "span");
|
|
}
|
|
}
|
|
if (!CollectionUtils.isEmpty(set)) {
|
|
if (!CollectionUtils.isEmpty(set)) {
|
|
set.stream().peek(s -> wpsBlocksVoList.add(new WpsBlocksVo("text", s))).collect(Collectors.toSet());
|
|
set.stream().peek(s -> wpsBlocksVoList.add(new WpsBlocksVo("text", s))).collect(Collectors.toSet());
|
|
@@ -504,10 +504,10 @@ public class WpsController extends BaseSystemController {
|
|
String operationDesc = jsonObject.getString("operationDesc");
|
|
String operationDesc = jsonObject.getString("operationDesc");
|
|
Set<String> set = this.replaceHtmlTag(operationDesc, "p");
|
|
Set<String> set = this.replaceHtmlTag(operationDesc, "p");
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
- set.addAll(this.replaceHtmlTag(operationDesc, "div"));
|
|
|
|
|
|
+ set = this.replaceHtmlTag(operationDesc, "div");
|
|
}
|
|
}
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
if (CollectionUtils.isEmpty(set)) {
|
|
- set.addAll(this.replaceHtmlTag(operationDesc, "span"));
|
|
|
|
|
|
+ set = this.replaceHtmlTag(operationDesc, "span");
|
|
}
|
|
}
|
|
List<WpsBlocksVo> wpsBlocksVoList = new ArrayList<>();
|
|
List<WpsBlocksVo> wpsBlocksVoList = new ArrayList<>();
|
|
List<WpsSectionsVo> wpsSectionsVoList = new ArrayList<>();
|
|
List<WpsSectionsVo> wpsSectionsVoList = new ArrayList<>();
|