|
|
@@ -652,7 +652,7 @@ public class WebpageController extends BaseController {
|
|
|
patentCategory = patentCategory.subList(0, Math.min(3, patentCategory.size()));
|
|
|
modelview.addObject("patentCategory", patentCategory);
|
|
|
List<JtBusinessProject> jtBusinessProjects = (List<JtBusinessProject>) jtBusinessService
|
|
|
- .getProjects(null, null, null, 5, 1, 1, 2, 0, 1, 0, 0, null).getList();
|
|
|
+ .getProjects(null,null, null, null, 5, 1, 1, 2, 0, 1, 0, 0, null).getList();
|
|
|
for (JtBusinessProject project : jtBusinessProjects) {
|
|
|
if (project.getMaxImgUrl() != null && project.getMaxImgUrl().length() <= 0)
|
|
|
project.setMaxImgUrl(null);
|
|
|
@@ -932,24 +932,24 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
// 最新发布
|
|
|
List<JtBusinessProjectResult> recents = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
- .getProjects(null, null, null, 4, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
+ .getProjects(null,null, null, null, 4, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
modelAndView.addObject("recent", recents);
|
|
|
|
|
|
// 专利服务-商标服务-版权服务
|
|
|
for (JtBusinessCategoryBo c : categoryBos) {
|
|
|
if ("专利服务".equals(c.getTopLevel())) {
|
|
|
List<JtBusinessProjectResult> res = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
- .getProjects(c.getTopLevelId(), null, null, 3, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
+ .getProjects(null,c.getTopLevelId(), null, null, 3, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
modelAndView.addObject("patentService", res);
|
|
|
modelAndView.addObject("patentTopId", c.getTopLevelId());
|
|
|
} else if ("商标服务".equals(c.getTopLevel())) {
|
|
|
List<JtBusinessProjectResult> res = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
- .getProjects(c.getTopLevelId(), null, null, 4, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
+ .getProjects(null,c.getTopLevelId(), null, null, 4, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
modelAndView.addObject("branchService", res);
|
|
|
modelAndView.addObject("branchTopId", c.getTopLevelId());
|
|
|
} else if ("版权服务".equals(c.getTopLevel())) {
|
|
|
List<JtBusinessProjectResult> res = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
- .getProjects(c.getTopLevelId(), null, null, 3, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
+ .getProjects(null,c.getTopLevelId(), null, null, 3, 1, 1, 2, 1, null, 0, 0, null).getList();
|
|
|
modelAndView.addObject("copyrightService", res);
|
|
|
modelAndView.addObject("copyrightTopId", c.getTopLevelId());
|
|
|
}
|
|
|
@@ -1016,7 +1016,7 @@ public class WebpageController extends BaseController {
|
|
|
OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
|
|
|
modelAndView.addObject("org", org);
|
|
|
List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
- .getProjects(null, null, null, 4, 1, 0, 2, null, null, 0, 0, uid).getList();
|
|
|
+ .getProjects(null,null, null, null, 4, 1, 0, 2, null, null, 0, 0, uid).getList();
|
|
|
modelAndView.addObject("jtProjects", projectResults);
|
|
|
String honor = org.getHonorPicture();
|
|
|
if (honor != null && honor.contains(".")) {
|