Bläddra i källkod

Merge branch 'master' of jishutao/jitao-server into test

liliang4869 7 år sedan
förälder
incheckning
68ac2d3b73
1 ändrade filer med 10 tillägg och 0 borttagningar
  1. 10 0
      src/main/java/com/goafanti/common/controller/WebpageController.java

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

@@ -287,6 +287,9 @@ public class WebpageController extends BaseController {
 		if(gaoqi2!=null)
 		{
 		List<JtBusinessProject>gaoqiList=jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(),6);
+		for(JtBusinessProject project:gaoqiList) {
+			if(project.getMinImgUrl()!=null && project.getMaxImgUrl().length()<=0)project.setMinImgUrl(null);
+		}
 		modelview.addObject("gaoqiList",gaoqiList); 
 		modelview.addObject("gqc1",gaoqi);}
 		//知识产权贯标
@@ -332,6 +335,9 @@ public class WebpageController extends BaseController {
 	public ModelAndView portalServiceServiceDetail(HttpServletRequest request, ModelAndView modelview,String id) {
 	modelview.setViewName("/portal/service/serviceDetails");
 	JtBusinessProject jtBusinessProject=jtBusinessService.getBusinessProjectDetail(id);
+	if(jtBusinessProject!=null) {
+		if(jtBusinessProject.getMaxImgUrl()!=null && jtBusinessProject.getMaxImgUrl().length()<=0)jtBusinessProject.setMaxImgUrl(null);
+	}
 	modelview.addObject("pj",jtBusinessProject);
 	System.out.println(jtBusinessProject.toString());
 	if(jtBusinessProject!=null) {
@@ -516,6 +522,10 @@ public class WebpageController extends BaseController {
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/index");
 		List<JtBusinessProject> jtBusinessProjects=jtBusinessService.getProjectsLimit(5);
+		for(JtBusinessProject project:jtBusinessProjects) {
+			if(project.getMaxImgUrl()!=null && project.getMaxImgUrl().length()<=0)project.setMaxImgUrl(null);
+			if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
+		}
 		modelview.addObject("projects",jtBusinessProjects);
 		List<AchievementObject> achievementObjects=achievementService.getHotAchievements(9, url, "web_index");
 		modelview.addObject("achievements",achievementObjects);