|
|
@@ -347,7 +347,23 @@ public class WebpageController extends BaseController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
|
|
|
public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- modelview.setViewName("/portal/service/serviceIndex");
|
|
|
+ modelview.setViewName("/portal/service/serviceIndex");
|
|
|
+ //根据标签名称获得项目
|
|
|
+ List<JtBusinessProject> sc = jtBusinessService.getProjectByTag("政府市场采购", 3);
|
|
|
+ modelview.addObject("sc", sc);
|
|
|
+ List<JtBusinessProject> cg = jtBusinessService.getProjectByTag("军工市场采购", 3);
|
|
|
+ modelview.addObject("cg", cg);
|
|
|
+ List<JtBusinessProject> gj = jtBusinessService.getProjectByTag("国际市场开发", 3);
|
|
|
+ modelview.addObject("gj", gj);
|
|
|
+ List<JtBusinessProject> js = jtBusinessService.getProjectByTag("减税免税", 3);
|
|
|
+ modelview.addObject("js", js);
|
|
|
+ List<JtBusinessProject> rz = jtBusinessService.getProjectByTag("融资租售", 3);
|
|
|
+ modelview.addObject("rz", rz);
|
|
|
+ List<JtBusinessProject> gf = jtBusinessService.getProjectByTag("攻防利器", 3);
|
|
|
+ modelview.addObject("gf", gf);
|
|
|
+ List<JtBusinessProject> ts = jtBusinessService.getProjectByTag("他山己用", 3);
|
|
|
+ modelview.addObject("ts", ts);
|
|
|
+
|
|
|
// 政策
|
|
|
// List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
|
|
|
List<PolicyResult> policies = (List<PolicyResult>) policyService
|
|
|
@@ -1408,7 +1424,7 @@ public class WebpageController extends BaseController {
|
|
|
//获得法律顾问列表数据
|
|
|
String id = TokenManager.getUserId();
|
|
|
if(null != id){
|
|
|
- modelview.addObject("userType", userService.selectByPrimaryKey(TokenManager.getUserToken().getId()).getType());
|
|
|
+ modelview.addObject("userType", userService.selectByPrimaryKey(id).getType());
|
|
|
}
|
|
|
modelview.addObject("slist", userIdentityService.consultantList( null, 1, 4, null, null, null, 0, 12).getList());
|
|
|
modelview.setViewName("/portal/service/safeguarding");
|
|
|
@@ -1460,7 +1476,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.setViewName("/portal/adviser");
|
|
|
String id = TokenManager.getUserId();
|
|
|
if(null != id){
|
|
|
- modelview.addObject("userType", userService.selectByPrimaryKey(TokenManager.getUserToken().getId()).getType());
|
|
|
+ modelview.addObject("userType", userService.selectByPrimaryKey(id).getType());
|
|
|
}
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -1539,4 +1555,6 @@ public class WebpageController extends BaseController {
|
|
|
return modelview;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
}
|