Merge branch 'dev_bugfix' into dev_temp

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java

@@ -24,10 +24,10 @@ public class WxUserInfoFormDTO implements Serializable {
     /**
      * 性别0未知1男性2女性
      */
-    @NotBlank(message = "性别不能为空")
+    //@NotBlank(message = "性别不能为空")
     private String gender;
 
-    @NotBlank(message = "头像不能为空")
+    //@NotBlank(message = "头像不能为空")
     private String avatarUrl;
 
     //@NotBlank(message = "所在省份不能为空")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -123,8 +123,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         //前台和后台已有实体字段不对于 需要挨个赋值
         userWechatDTO.setUserId(wxUserInfoFormDTO.getUserId());
         userWechatDTO.setNickname(wxUserInfoFormDTO.getNickName() == null ? null : wxUserInfoFormDTO.getNickName());
-        userWechatDTO.setSex(Integer.parseInt(wxUserInfoFormDTO.getGender()));
+        userWechatDTO.setSex(Integer.parseInt(wxUserInfoFormDTO.getGender() == null ? "0" : wxUserInfoFormDTO.getGender()));
-        userWechatDTO.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl());
+        userWechatDTO.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl() == null ? null : wxUserInfoFormDTO.getAvatarUrl());
         userWechatDTO.setCountry(wxUserInfoFormDTO.getCountry() == null ? null : wxUserInfoFormDTO.getCountry());
         userWechatDTO.setProvince(wxUserInfoFormDTO.getProvince() == null ? null : wxUserInfoFormDTO.getProvince());
         userWechatDTO.setCity(wxUserInfoFormDTO.getCity() == null ? null : wxUserInfoFormDTO.getCity());