|
|
@@ -5,14 +5,17 @@ import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
+
|
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.app.bo.ExpertsListBo;
|
|
|
@@ -36,6 +39,7 @@ import com.goafanti.common.model.JtBusinessProject;
|
|
|
import com.goafanti.common.model.News;
|
|
|
import com.goafanti.common.model.Policy;
|
|
|
import com.goafanti.common.model.User;
|
|
|
+import com.goafanti.common.model.UserIdentity;
|
|
|
import com.goafanti.common.service.GlobalSearchService;
|
|
|
import com.goafanti.common.utils.LimitLengthUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
@@ -498,7 +502,16 @@ public class WebpageController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
modelview.addObject("owner", owner);
|
|
|
- modelview.addObject("pj", jtBusinessProject);
|
|
|
+ modelview.addObject("pj", jtBusinessProject);
|
|
|
+
|
|
|
+ //判断是否是个人还是组织
|
|
|
+ if(null != jtBusinessProject.getType() && 0 == jtBusinessProject.getType()){//个人
|
|
|
+ UserIdentity uide = userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
|
|
|
+ modelview.addObject("uide", uide);
|
|
|
+ }else if(null != jtBusinessProject.getType() && 1 == jtBusinessProject.getType()){//企业
|
|
|
+ String oide = organizationIdentityService.selectOrgIdentityBoByUserId(jtBusinessProject.getOwnerId()).getUid();
|
|
|
+ modelview.addObject("oide", oide);
|
|
|
+ }
|
|
|
//System.out.println(jtBusinessProject.toString());
|
|
|
if (jtBusinessProject != null) {
|
|
|
JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
|
|
|
@@ -545,7 +558,15 @@ public class WebpageController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
modelview.addObject("owner", owner);
|
|
|
- modelview.addObject("pj", jtBusinessProject);
|
|
|
+ modelview.addObject("pj", jtBusinessProject);
|
|
|
+ //判断是否是个人还是组织
|
|
|
+ if(0 == jtBusinessProject.getType()){//个人
|
|
|
+ UserIdentity uide = userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
|
|
|
+ modelview.addObject("uide", uide);
|
|
|
+ }else if(1 == jtBusinessProject.getType()){//企业
|
|
|
+ String oide = organizationIdentityService.selectOrgIdentityBoByUserId(jtBusinessProject.getOwnerId()).getUid();
|
|
|
+ modelview.addObject("oide", oide);
|
|
|
+ }
|
|
|
//System.out.println(jtBusinessProject.toString());
|
|
|
if (jtBusinessProject != null) {
|
|
|
JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
|
|
|
@@ -1106,7 +1127,7 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
// 知产百科
|
|
|
List<News> news = (List<News>) newsService
|
|
|
- .listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, "web_tech_service_index",null)
|
|
|
+ .listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, null,null)
|
|
|
.getList();
|
|
|
for (News n : news) {
|
|
|
if (null != n.getTitleImg() && n.getTitleImg().contains(",")) {
|