Commit 0a5e05db authored by 赵啸非's avatar 赵啸非

添加门户系统模块添加配置

parent 4519353d
...@@ -32,6 +32,7 @@ import java.util.Arrays; ...@@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
...@@ -141,11 +142,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -141,11 +142,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
//加载模板,合成模板数据 //加载模板,合成模板数据
Map data = new HashMap(); Map data = new HashMap();
entity.getSkinFieldList().stream().forEach(field -> { List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> {
updateUrl(field); updateUrl(field);
}); return field;
}).collect(Collectors.toList());
data.put("columns", entity.getSkinFieldList()); data.put("columns",collect);
String temp = "skin.css.ftl"; String temp = "skin.css.ftl";
try { try {
FreeMarkerUtils.initFreeMarker(temp); FreeMarkerUtils.initFreeMarker(temp);
......
...@@ -34,7 +34,8 @@ public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplat ...@@ -34,7 +34,8 @@ public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplat
@Override @Override
protected void findAfter(SkinTemplateEntity params, PageInfo pageInfo, Context context, List<SkinTemplateEntity> list) throws AppException { protected void findAfter(SkinTemplateEntity params, PageInfo pageInfo, Context context, List<SkinTemplateEntity> list) throws AppException {
list.stream().forEach(item -> { list.stream().forEach(item -> {
List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().templateId(item.getId())).stream().filter(f->f.getSkinId()==null).collect(Collectors.toList()); List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().templateId(item.getId()))
.stream().filter(f->f.getSkinId()==null).collect(Collectors.toList());
item.setSkinFieldList(skinFieldEntities); item.setSkinFieldList(skinFieldEntities);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment