|
|
@@ -290,10 +290,11 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("gqc1",gaoqi);}
|
|
|
//知识产权贯标
|
|
|
JtBusinessCategory zscqgb=jtBusinessService.getBusinessCategoryByLayerAndName(1, "知识产权");
|
|
|
+ if(zscqgb!=null) {
|
|
|
List<JtBusinessCategory> zscqgbCategories=jtBusinessService.getBusinessCategoryBySuperId(zscqgb.getId(), 4);
|
|
|
int[]zscqsizes= {1,2,4,10};
|
|
|
businessHelper(modelview, "zscqgb", zscqgbCategories, zscqsizes);
|
|
|
- modelview.addObject("zscqc1",zscqgb);
|
|
|
+ modelview.addObject("zscqc1",zscqgb);}
|
|
|
//企业认证
|
|
|
JtBusinessCategory qiyerenzheng=jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业认证");
|
|
|
if(qiyerenzheng!=null) {
|
|
|
@@ -676,7 +677,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("practicalTechnology",practicalTechnology);
|
|
|
|
|
|
// List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
|
|
|
- List<Policy> policies=(List<Policy>) policyService.searchPolicy("", null, null, null, "web_index", 1, 5);
|
|
|
+ List<Policy> policies=(List<Policy>) policyService.searchPolicy("", null, null, null, "web_index", 1, 5).getList();
|
|
|
modelview.addObject("policyList",policies);
|
|
|
return modelview;
|
|
|
}
|