anderx пре 7 година
родитељ
комит
970ce8cc7d

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

@@ -645,7 +645,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("projects",jtBusinessProjects);
 		List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2,null).getList();
 		modelview.addObject("policys",policies);
-		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, null).getList();
+		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, null, 1, 3, "2", null, null).getList();
 		modelview.addObject("news",newsList);
 //		
 		List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, null).getList();
@@ -987,7 +987,7 @@ public class WebpageController extends BaseController {
 				modelview.addObject("type",type); 
 				if(type ==null )type=1;
 				if(type ==1) {
-				Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null,2);
+				Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, null, 1, null, null,2);
 				News newsDetail = newsService.findNewsDetail(id);
 				Object news =null;
 				if(newsList!=null && newsList.getList().size()>0)news= newsList.getList().get(0);

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html