|
@@ -173,14 +173,19 @@ public class WxGzhServiceImpl implements IWxGzhService {
|
|
|
UserInfo parentUserInfo = userService.getStudentByOpenId(parentOpenid);
|
|
|
if (parentUserInfo != null && (parentUserInfo.getSaleType() ==1 || parentUserInfo.getSaleType() ==3 )){
|
|
|
userInfo.setSaleType(1);
|
|
|
- user.setSaleType(1);
|
|
|
+ if (user!= null){
|
|
|
+ user.setSaleType(1);
|
|
|
+ }
|
|
|
+
|
|
|
if (!StringUtils.isEmpty(parentUserInfo.getSchoolName())){
|
|
|
userInfo.setCityName(parentUserInfo.getCityName());
|
|
|
userInfo.setSchoolName(parentUserInfo.getSchoolName());
|
|
|
userInfo.setAreaName(parentUserInfo.getAreaName());
|
|
|
- user.setCityName(parentUserInfo.getCityName());
|
|
|
- user.setSchoolName(parentUserInfo.getSchoolName());
|
|
|
- user.setAreaName(parentUserInfo.getAreaName());
|
|
|
+ if (user!= null){
|
|
|
+ user.setCityName(parentUserInfo.getCityName());
|
|
|
+ user.setSchoolName(parentUserInfo.getSchoolName());
|
|
|
+ user.setAreaName(parentUserInfo.getAreaName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
result = MessageUtil.initText(fromUserName,toUserName,subscribeEvent);
|