bug修改

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java

@@ -136,14 +136,14 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             PaUserWechatEntity wechatEntity = new PaUserWechatEntity();
             wechatEntity.setUserId(userEntity.getId());
             wechatEntity.setWxOpenId(wxMpUser.getOpenId());
-            wechatEntity.setUnionId(wxMpUser.getUnionId());
+            wechatEntity.setUnionId(null == wxMpUser.getUnionId() ? "" : wxMpUser.getUnionId());
             wechatEntity.setGender(wxMpUser.getSex().toString());
             wechatEntity.setNickname(wxMpUser.getNickname());
-            wechatEntity.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-            wechatEntity.setCountry(wxMpUser.getCountry());
-            wechatEntity.setProvince(wxMpUser.getProvince());
-            wechatEntity.setCity(wxMpUser.getCity());
-            wechatEntity.setLanguage(wxMpUser.getLanguage());
+            wechatEntity.setHeadImgUrl(null == wxMpUser.getHeadImgUrl() ? "" : wxMpUser.getHeadImgUrl());
+            wechatEntity.setCountry(null == wxMpUser.getCountry() ? "" : wxMpUser.getCountry());
+            wechatEntity.setProvince(null == wxMpUser.getProvince() ? "" : wxMpUser.getProvince());
+            wechatEntity.setCity(null == wxMpUser.getCity() ? "" : wxMpUser.getCity());
+            wechatEntity.setLanguage(null == wxMpUser.getLanguage() ? "" : wxMpUser.getLanguage());
             paUserWechatService.insert(wechatEntity);
 
             resultDTO.setUserId(userEntity.getId());
@@ -152,11 +152,11 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             PaUserWechatEntity wechatEntity = ConvertUtils.sourceToTarget(wechatDTO, PaUserWechatEntity.class);
             wechatEntity.setGender(wxMpUser.getSex().toString());
             wechatEntity.setNickname(wxMpUser.getNickname());
-            wechatEntity.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-            wechatEntity.setCountry(wxMpUser.getCountry());
-            wechatEntity.setProvince(wxMpUser.getProvince());
-            wechatEntity.setCity(wxMpUser.getCity());
-            wechatEntity.setLanguage(wxMpUser.getLanguage());
+            wechatEntity.setHeadImgUrl(null == wxMpUser.getHeadImgUrl() ? "" : wxMpUser.getHeadImgUrl());
+            wechatEntity.setCountry(null == wxMpUser.getCountry() ? "" : wxMpUser.getCountry());
+            wechatEntity.setProvince(null == wxMpUser.getProvince() ? "" : wxMpUser.getProvince());
+            wechatEntity.setCity(null == wxMpUser.getCity() ? "" : wxMpUser.getCity());
+            wechatEntity.setLanguage(null == wxMpUser.getLanguage() ? "" : wxMpUser.getLanguage());
             paUserWechatService.updateById(wechatEntity);
 
             resultDTO.setUserId(wechatDTO.getUserId());