楼层展示时间bugfix

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -160,9 +160,7 @@
             <if test="tinyTypeID != null and tinyTypeID != 0">
                 AND a.tinyTypeID = #{tinyTypeID}
             </if>
-            <if test="newProductType !=null">
-                AND a.newProductType=#{newProductType}
-            </if>
+
             <if test="productCategory != null and productCategory != ''">
                 AND a.productCategory = #{productCategory}
                 <if test="productCategory == 2">
@@ -234,7 +232,9 @@
             <if test="newvalidFlag !=null and newvalidFlag!= ''">
                 AND a.newvalidFlag=#{newvalidFlag}
             </if>
-
+            <if test="newProductType !=null">
+                AND a.newProductType=#{newProductType}
+            </if>
             <if test="contactName !=null and contactName !=''">
                 AND (cshd.contactName LIKE concat('%',#{contactName},'%') or cshd.companyName LIKE
                 concat('%',#{contactName},'%'))
@@ -703,7 +703,7 @@
                 showTime=#{showTime},
             </if>
             <if test="newshowTime !=null">
-                newshowTime=#{newshowTime}
+                newshowTime=#{newshowTime},
             </if>
             <if test="newvalidFlag == 1">
                 showFlag=1

src/main/webapp/WEB-INF/views/modules/newhome/newFloorcontentForm.jsp

@@ -285,9 +285,6 @@ debugger
 					<c:if test="${not empty list.newshowTime}">
 					${list.newshowTime}~${list.showTime}
 					</c:if>
-	<c:if test="${not empty list.addTime && list.newshowTime ==null}">
-          ${list.addTime}~${list.showTime}
-	</c:if>
 				</td>
 				<td>
 					<c:if test="${not empty list.sortIndex && list.sortIndex!=0}">