|
|
@@ -61,8 +61,10 @@ public class TsfSocialService {
|
|
|
public Social getSocialForGoods(Social social){
|
|
|
Social socialInfo = socialDao.getSocialInfo(social);
|
|
|
|
|
|
- social.setSocialSq(socialInfo.getSocialSq());
|
|
|
- socialInfo.setSocialGoodsList(socialDao.getSocialGoodsList(social));
|
|
|
+ if(socialInfo != null){
|
|
|
+ social.setSocialSq(socialInfo.getSocialSq());
|
|
|
+ socialInfo.setSocialGoodsList(socialDao.getSocialGoodsList(social));
|
|
|
+ }
|
|
|
|
|
|
return socialInfo;
|
|
|
}
|