limin 7 vuotta sitten
vanhempi
commit
55a859d7e9

+ 9 - 2
src/main/java/com/goafanti/common/mapper/JtKnowledgeBaseMapper.xml

@@ -461,8 +461,10 @@
   	<bind name="kw" value="'%' + v.keyword + '%' "/>
 	and v.keyword like #{kw,jdbcType=VARCHAR}
   	</if>
-  	<if test="startTime != null and endTime != null">
-  	v.release_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	<if test="v.startTime != null and v.endTime != null">
+  	<bind name="st" value=" v.startTime + ' 00:00:00' "/>
+  	<bind name="et" value=" v.endTime + ' 23:59:59' "/>
+  	and v.release_time between #{st,jdbcType=VARCHAR} and #{et,jdbcType=VARCHAR}
   	</if>
   	<if test="v.top != null">
     and v.top = #{v.top,jdbcType=INTEGER}
@@ -506,6 +508,11 @@
   	<bind name="kw" value="'%' + v.keyword + '%' "/>
 	and v.keyword like #{kw,jdbcType=VARCHAR}
   	</if>
+  	<if test="v.startTime != null and v.endTime != null">
+  	<bind name="st" value=" v.startTime + ' 00:00:00' "/>
+  	<bind name="et" value=" v.endTime + ' 23:59:59' "/>
+  	and v.release_time between #{st,jdbcType=VARCHAR} and #{et,jdbcType=VARCHAR}
+  	</if>
   	<if test="v.top != null">
     and v.top = #{v.top,jdbcType=INTEGER}
    </if>

+ 4 - 2
src/main/webapp/WEB-INF/views/portal/special/special.html

@@ -95,7 +95,7 @@
 					<div class="videoImg" th:if="${policy!=null}">
 						<a th:href="@{/portal/news/newsDetail(id=${policy.id},type=0)}">
 							<div>
-								<img th:src="${policy != null? avatarUploadHost+policy.titleImg :portalHost+'/img/newMenu/zhengce.png'}" alt="">
+								<img th:src="${policy.titleImg != null and policy.titleImg != '' ? avatarUploadHost+policy.titleImg :portalHost+'/img/newMenu/zhengce.png'}" alt="">
 								<h4 th:text="${#strings.abbreviate(policy.title,15)}">视频标题视频标题视频标题视频标题</h4>
 								<div></div>
 							</div>
@@ -113,7 +113,9 @@
 						</li>
 					</ul>	
 				</div>
-				<img th:src="${portalHost+'/img/newMenu/guandian.png'}" alt="">
+				<a th:href="@{/portal/thinkTank/policyList?type=99}">
+					<img th:src="${portalHost+'/img/newMenu/guandian.png'}" alt="">
+				</a>
 			</div>
 		</div>
 		<!-- 公共底部 -->

+ 4 - 2
src/main/webapp/WEB-INF/views/portal/special/specialDetail.html

@@ -100,7 +100,7 @@
 					<div class="videoImg" th:if="${policy!=null}">
 						<a th:href="@{/portal/news/newsDetail(id=${policy.id},type=0)}">
 							<div>
-								<img th:src="${policy != null? avatarUploadHost+policy.titleImg :portalHost+'/img/newMenu/zhengce.png'}" alt="">
+								<img th:src="${policy.titleImg != null and policy.titleImg != '' ? avatarUploadHost+policy.titleImg :portalHost+'/img/newMenu/zhengce.png'}" alt="">
 								<h4 th:text="${#strings.abbreviate(policy.title,16)}">视频标题视频标题视频标题视频标题</h4>
 								<div></div>
 							</div>
@@ -118,7 +118,9 @@
 						</li>
 					</ul>	
 				</div>
-				<img th:src="${portalHost+'/img/newMenu/guandian.png'}" alt="">
+				<a th:href="@{/portal/thinkTank/policyList?type=99}">
+					<img th:src="${portalHost+'/img/newMenu/guandian.png'}" alt="">
+				</a>
 			</div>
 		</div>
 		<!-- 公共底部 -->