兼容数据参数

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -178,9 +178,6 @@ public class UserController extends AppBaseController {
                 throw new BaseException("此用户所属公司不存在或已停用");
             }
 
-            if (StringUtils.isNotEmpty(param.getAppid())){
-                param.setAppid(param.getAppId());
-            }
             if (StringUtils.isNotEmpty(company.getCourseMiniAppId()) && !company.getCourseMiniAppId().equals(param.getAppid())){
                 return R.error("登录用户不属于该小程序");
             }

fs-company-app/src/main/java/com/fs/app/param/LoginParam.java

@@ -1,5 +1,7 @@
 package com.fs.app.param;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -7,6 +9,7 @@ import javax.validation.constraints.NotBlank;
 
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class LoginParam {
     @NotBlank(message = "请填写帐号")
     private String account;
@@ -14,8 +17,7 @@ public class LoginParam {
     private String password;
 
     private String jpushId;
-
+    @JsonAlias({"appid", "appId"})
     private String appid;
 
-    private String appId;
 }

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -150,11 +150,7 @@ public class UserController extends  AppBaseController {
         FsUser user=new FsUser();
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
-        if (StringUtils.isNotEmpty(param.getNickname())){
-            user.setNickName(param.getNickname());
-        }else {
-            user.setNickName(param.getNickName());
-        }
+        user.setNickName(param.getNickname());
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }

fs-user-app/src/main/java/com/fs/app/param/FsUserEditParam.java

@@ -1,19 +1,22 @@
 package com.fs.app.param;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
-@Getter
-@Setter
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FsUserEditParam implements Serializable {
 
+    @NotNull(message = "用户昵称不能为空！")
+    @JsonAlias({"nickname", "nickName"})
     private String nickname;
 
-    private String nickName;
-
     //    @NotBlank(message = "用户头像不能为空！")
     private String avatar;