diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index eda2a6a5..6f0b81ed 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -93,6 +93,7 @@ import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; +import org.springframework.web.util.HtmlUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -384,7 +385,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 企标权限校验 enterpriseCheck(sarFileSplitInfoEO); // 唯一校验 - uniqueCheck(sarFileSplitInfoEO); +// uniqueCheck(sarFileSplitInfoEO); // 保存文本拆分数据 saveDocumentSplitInfo(sarFileSplitInfoEO); //拆分 @@ -632,6 +633,10 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { for (SarFileSplitItemsValEO sarFileSplitItemsValEO : valList) { // 条文内容拼接 if (DocumentSplitCommon.TEXT.equals(sarFileSplitItemsValEO.getType())) { + if (StringUtils.isNotBlank(sarFileSplitItemsValEO.getItemContent())){ + sarFileSplitItemsValEO.setItemContent(sarFileSplitItemsValEO.getItemContent() + .replace("<", "<").replace(">", ">")); + } valContent.append("
").append(sarFileSplitItemsValEO.getItemContent()).append("
"); } else if (DocumentSplitCommon.IMG.equals(sarFileSplitItemsValEO.getType())) { valContent.append("" + p + "
"); @@ -1124,6 +1127,9 @@ public class FileSpiltService { for (XWPFRun xwrun : paragraph.getRuns()) { VerticalAlign subscript = xwrun.getSubscript(); String smalltext = xwrun.getText(0); + if (StringUtils.isNotBlank(smalltext)){ + smalltext = smalltext.replace("<", "<").replace(">", ">"); + } if (smalltext==null){ continue; }