Commit 60318551 authored by 赵啸非's avatar 赵啸非

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

parent 0a5e05db
...@@ -7,6 +7,7 @@ import com.mortals.framework.model.PageInfo; ...@@ -7,6 +7,7 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.common.utils.FreeMarkerUtils; import com.mortals.xhx.common.utils.FreeMarkerUtils;
import com.mortals.xhx.module.product.model.ProductEntity; import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService; import com.mortals.xhx.module.product.service.ProductService;
...@@ -19,6 +20,7 @@ import com.mortals.xhx.module.skin.service.SkinBaseService; ...@@ -19,6 +20,7 @@ import com.mortals.xhx.module.skin.service.SkinBaseService;
import com.mortals.xhx.module.skin.service.SkinFieldService; import com.mortals.xhx.module.skin.service.SkinFieldService;
import freemarker.template.Template; import freemarker.template.Template;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile; import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -143,8 +145,10 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk ...@@ -143,8 +145,10 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
Map data = new HashMap(); Map data = new HashMap();
List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> { List<SkinFieldEntity> collect = entity.getSkinFieldList().stream().map(field -> {
updateUrl(field); SkinFieldEntity skinFieldEntity = new SkinFieldEntity();
return field; BeanUtils.copyProperties(field,skinFieldEntity, BeanUtil.getNullPropertyNames(field));
updateUrl(skinFieldEntity);
return skinFieldEntity;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
data.put("columns",collect); data.put("columns",collect);
......
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