parent
ca13da45e7
commit
69c22679c3
|
@ -26,8 +26,10 @@ import cn.hutool.core.util.PageUtil;
|
|||
import freemarker.core.ParseException;
|
||||
import freemarker.template.MalformedTemplateNameException;
|
||||
import freemarker.template.TemplateNotFoundException;
|
||||
import net.mingsoft.base.constant.Const;
|
||||
import net.mingsoft.basic.util.BasicUtil;
|
||||
import net.mingsoft.basic.util.SpringUtil;
|
||||
import net.mingsoft.basic.util.StringUtil;
|
||||
import net.mingsoft.cms.bean.ContentBean;
|
||||
import net.mingsoft.cms.biz.ICategoryBiz;
|
||||
import net.mingsoft.cms.biz.IContentBiz;
|
||||
|
@ -39,19 +41,19 @@ import net.mingsoft.mdiy.biz.IContentModelBiz;
|
|||
import net.mingsoft.mdiy.biz.IModelBiz;
|
||||
import net.mingsoft.mdiy.biz.IPageBiz;
|
||||
import net.mingsoft.mdiy.entity.ContentModelEntity;
|
||||
import net.mingsoft.mdiy.entity.ModelEntity;
|
||||
import net.mingsoft.mdiy.entity.PageEntity;
|
||||
import net.mingsoft.mdiy.parser.TagParser;
|
||||
import net.mingsoft.mdiy.util.ParserUtil;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="contentTitle != null and contentTitle != ''">content_title,</if>
|
||||
<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id,</if>
|
||||
<if test="contentType != null and contentType != ''">content_type,</if>
|
||||
<if test="contentType != null ">content_type,</if>
|
||||
<if test="contentDisplay != null and contentDisplay != ''">content_display,</if>
|
||||
<if test="contentAuthor != null and contentAuthor != ''">content_author,</if>
|
||||
<if test="contentSource != null and contentSource != ''">content_source,</if>
|
||||
|
@ -110,7 +110,7 @@
|
|||
<set>
|
||||
<if test="contentTitle != null and contentTitle != ''">content_title=#{contentTitle},</if>
|
||||
<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id=#{contentCategoryId},</if>
|
||||
<if test="contentType != null and contentType != ''">content_type=#{contentType},</if>
|
||||
<if test="contentType != null ">content_type=#{contentType},</if>
|
||||
<if test="contentDisplay != null and contentDisplay != ''">content_display=#{contentDisplay},</if>
|
||||
<if test="contentAuthor != null and contentAuthor != ''">content_author=#{contentAuthor},</if>
|
||||
<if test="contentSource != null and contentSource != ''">content_source=#{contentSource},</if>
|
||||
|
|
|
@ -397,7 +397,7 @@
|
|||
ms.http.get(ms.manager + "/mdiy/model/get.do",{
|
||||
id:this.currCategory.mdiyModelId
|
||||
}).then(function (data) {
|
||||
if(data.data.id){
|
||||
if(data.data && data.data.id){
|
||||
that.rederModel(data.data,JSON.parse(data.data.modelJson))
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue