Merge branch 'revert-e050beb7' into 'master'

Revert "Merge branch 'fix-zyq-replaceUnescaped' into 'master'"

See merge request rays/pcloud-book!134

pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

@@ -254,8 +254,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
                 return;
             }
 
-            this.replaceUnescaped(adNewsList);
-
             // 构建记录对象
             for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
                 for (AdNews adNews : adNewsList) {
@@ -358,34 +356,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
     }
 
     /**
-     * 替换转义符
-     * @param adNewsList
-     */
-    private void replaceUnescaped(List<AdNews> adNewsList) {
-        for (AdNews adNews : adNewsList) {
-            if (!StringUtil.isEmpty(adNews.getTitle())) {
-                adNews.setTitle(adNews.getTitle()
-                        .replaceAll("&amp;quot;", "\"")
-                        .replaceAll("&nbsp;", " "));
-            }
-        }
-    }
-
-    /**
-     * 替换转义符
-     * @param adNewsGroupRecordVOS
-     */
-    private void replaceUnescaped4Record(List<AdNewsGroupRecordVO> adNewsGroupRecordVOS) {
-        for (AdNewsGroupRecordVO adNewsGroupRecordVO : adNewsGroupRecordVOS) {
-            if (!StringUtil.isEmpty(adNewsGroupRecordVO.getTitle())) {
-                adNewsGroupRecordVO.setTitle(adNewsGroupRecordVO.getTitle()
-                        .replaceAll("&amp;quot;", "\"")
-                        .replaceAll("&nbsp;", " "));
-            }
-        }
-    }
-
-    /**
      * 将发送记录入库
      *
      * @param adNewsGroupRecords
@@ -550,7 +520,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
         map.put("adNewsWechatIds", adNewsListParam.getAdNewsWechatIds());
         map.put("contentFrom", adNewsListParam.getContentFrom());
         PageBeanNew<AdNews> pageBeanNew = adNewsDao.listPageNew(pageParam, map, "getAdNewsList");
-        this.replaceUnescaped(pageBeanNew.getRecordList());
         return pageBeanNew;
     }
 
@@ -752,9 +721,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
     @Override
     @ParamLog("查询早晚报发送详情")
     public List<AdNewsGroupRecordVO> getAdNewsGroupRecord(Long partyId, Long messageStatisticId) {
-        List<AdNewsGroupRecordVO> adNewsGroupRecordVOS= adNewsGroupRecordDao.getAdNewsGroupRecord(partyId, messageStatisticId);
-        this.replaceUnescaped4Record(adNewsGroupRecordVOS);
-        return adNewsGroupRecordVOS;
+        return adNewsGroupRecordDao.getAdNewsGroupRecord(partyId, messageStatisticId);
     }
 
     @Override