diff --git a/src/main/java/com/rebuild/core/service/feeds/BaseFeedsService.java b/src/main/java/com/rebuild/core/service/feeds/BaseFeedsService.java index 34a129511..22789e4e6 100644 --- a/src/main/java/com/rebuild/core/service/feeds/BaseFeedsService.java +++ b/src/main/java/com/rebuild/core/service/feeds/BaseFeedsService.java @@ -44,7 +44,7 @@ public abstract class BaseFeedsService extends ObservableService { @Override public Record create(Record record) { - record = super.create(converContent(record)); + record = super.create(converContent4Mentions(record)); awareMention(record, true); return record; @@ -52,7 +52,7 @@ public abstract class BaseFeedsService extends ObservableService { @Override public Record update(Record record) { - record = super.update(converContent((record))); + record = super.update(converContent4Mentions((record))); awareMention(record, false); return record; @@ -174,7 +174,7 @@ public abstract class BaseFeedsService extends ObservableService { * @param record * @return */ - private Record converContent(Record record) { + private Record converContent4Mentions(Record record) { String content = record.getString("content"); if (StringUtils.isBlank(content)) return record; diff --git a/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java b/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java index 0c56a264c..ca0fd3f33 100644 --- a/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java +++ b/src/main/java/com/rebuild/web/admin/audit/RevisionHistoryController.java @@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.rebuild.core.Application; +import com.rebuild.core.metadata.EntityHelper; import com.rebuild.core.metadata.MetadataHelper; import com.rebuild.core.metadata.easymeta.EasyField; import com.rebuild.core.metadata.easymeta.EasyMetaFactory; @@ -87,6 +88,7 @@ public class RevisionHistoryController extends EntityController { // 补充字段名称 private void paddingFieldsName(JSONArray contents, Entity entity) { + final int entityCode = entity.getEntityCode(); for (Iterator iter = contents.iterator(); iter.hasNext(); ) { JSONObject item = (JSONObject) iter.next(); String fieldName = item.getString("field"); @@ -95,8 +97,12 @@ public class RevisionHistoryController extends EntityController { EasyField easyField = EasyMetaFactory.valueOf(entity.getField(fieldName)); // 排除不可查询字段 if (!easyField.isQueryable()) { - iter.remove(); - continue; + if (fieldName.equalsIgnoreCase("contentMore") && entityCode == EntityHelper.Feeds) { + // 保留 + } else { + iter.remove(); + continue; + } } fieldName = easyField.getLabel(); diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml index 1b561a462..249627c35 100644 --- a/src/main/resources/metadata-conf.xml +++ b/src/main/resources/metadata-conf.xml @@ -427,7 +427,7 @@ - +