Explorar o código

信息中心优化

kaick hai 1 ano
pai
achega
de7c983136

+ 4 - 2
src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -265,8 +265,10 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
         List<CmBaikeTextInfo> textInfolist = cmBaikeProduct.getTextInfolist();
         if (null != textInfolist && textInfolist.size() > 0) {
             textInfolist.forEach(param -> {
-                param.setProductId(productId);
-                cmBaikeProductDao.insertText(param);
+                if(null!=param.getDictionaryContent()){
+                    param.setProductId(productId);
+                    cmBaikeProductDao.insertText(param);
+                }
             });
         }
         // 保存问题

+ 0 - 1
src/main/resources/mappings/modules/info/InfoTypeMapper.xml

@@ -190,7 +190,6 @@
 			<if test="createDate != null "> and info_type.createDate = #{createDate}</if>
 <!--			<if test="updateBy != null "> and info_type.updateBy = #{updateBy}</if>-->
 			<if test="updateDate != null "> and info_type.updateDate = #{updateDate}</if>
-			<if test="delFlag != null "> and info_type.delFlag = #{delFlag}</if>
 			<if test="type != null  and type != ''">
 				and info_type.type
 					= #{type}

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/cmpage/cmPageBeautyForm.jsp

@@ -133,7 +133,7 @@
         <div class="controls">
             <form:select path="backgroundType" class="input-xlarge " id="selectBgType">
                 <form:option value="" label="请选择"/>
-                <form:options items="${fns:getDictList('backgroundType')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundType')[0]}"/>
+                <form:options items="${[fns:getDictList('backgroundType')[0]]}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundType')[0]}"/>
             </form:select>
         </div>
     </div>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/cmpage/cmPageShortcutForm.jsp

@@ -97,7 +97,7 @@
         <div class="controls">
             <form:select path="backgroundType" class="input-xlarge " id="selectBgType">
                 <form:option value="" label="请选择"/>
-                <form:options items="${fns:getDictList('backgroundType')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundType')[0]}"/>
+                <form:options items="${[fns:getDictList('backgroundType')[0]]}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('backgroundType')[0]}"/>
             </form:select>
         </div>
     </div>

+ 1 - 1
src/main/webapp/static/content-edit.js

@@ -314,7 +314,7 @@ class ContentEditInput {
         this.edit = new ContentEdit({
             el: this.input[0],
             change: (html) => {
-                this.realInput.attr('value', html)
+                this.realInput.attr('value', html.replace(/\n/g, '<br/>'))
             },
         })
         if(this.edit){