|
@@ -80,8 +80,11 @@ public class WebpageController extends BaseController {
|
|
|
MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
|
|
MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
|
|
|
List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(
|
|
List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(
|
|
|
MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
|
|
MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
|
|
|
|
|
+ List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(
|
|
|
|
|
+ MarketingPage.specialist.getPageUrl(), MarketingPage.specialist.getBoothType());
|
|
|
modelview.addObject("achievementList", achievementList);
|
|
modelview.addObject("achievementList", achievementList);
|
|
|
modelview.addObject("demandList", demandList);
|
|
modelview.addObject("demandList", demandList);
|
|
|
|
|
+ modelview.addObject("speciaList", speciaList);
|
|
|
return modelview;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -201,11 +204,13 @@ public class WebpageController extends BaseController {
|
|
|
/* 查询相关智者信息 */
|
|
/* 查询相关智者信息 */
|
|
|
List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
|
|
List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
|
|
|
List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
|
|
List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
|
|
|
- if (userPartner != null && userPartner.size() >= 4) {
|
|
|
|
|
- int index = (int) new Random().nextInt(userPartner.size() - 3);
|
|
|
|
|
|
|
+ if (userPartner != null && userPartner.size() >= 6) {
|
|
|
|
|
+ int index = (int) new Random().nextInt(userPartner.size() - 5);
|
|
|
reuserPartner.add(userPartner.get(index));
|
|
reuserPartner.add(userPartner.get(index));
|
|
|
reuserPartner.add(userPartner.get(index + 1));
|
|
reuserPartner.add(userPartner.get(index + 1));
|
|
|
reuserPartner.add(userPartner.get(index + 2));
|
|
reuserPartner.add(userPartner.get(index + 2));
|
|
|
|
|
+ reuserPartner.add(userPartner.get(index + 3));
|
|
|
|
|
+ reuserPartner.add(userPartner.get(index + 4));
|
|
|
} else {
|
|
} else {
|
|
|
reuserPartner.addAll(userPartner);
|
|
reuserPartner.addAll(userPartner);
|
|
|
}
|
|
}
|