Sfoglia il codice sorgente

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 anni fa
parent
commit
5d1c365f64

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1417,7 +1417,7 @@ public class WebpageController extends BaseController {
 		if(null == policy.getType() || "".equals(policy.getType())){
 			res.setData(policyService.searchPolicyAndNewsList(policy, pageNo, pageSize));
 		}else if(policy.getType() == 0 || policy.getType() == 99 || policy.getType() == 98 ){//资讯\观点\知产 news表
-			Pagination<News> listNews = newsService.listNews(policy.getType(), null, null, null, null, null, null, pageNo, pageSize, "2", null, null,policy.getProvince());
+			Pagination<News> listNews = newsService.listNews(policy.getType(), policy.getTitle(), null, null, null, null, null, pageNo, pageSize, "2", null, null,policy.getProvince());
 			@SuppressWarnings("unchecked")
 			Iterator<News> iterator = (Iterator<News>) listNews.getList().iterator();
 			while (iterator.hasNext()) {

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html

@@ -391,7 +391,7 @@
 					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
 					
 				</h4>
-				<!-- <img th:src="(${policys[0].titleImg}==null)?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt=""> -->
+				<img th:src="(${policys[0].titleImg}==null)?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
 				<ul>				
 					<li th:each="p,pStatus:${policys}" th:if="${pStatus.index}==0">
 						<a th:href="@{/portal/news/newsDetail(id=${p.id},type=0)}">