Parcourir la source

userapp前端联调更改

yjwang il y a 1 semaine
Parent
commit
843209257c

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

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

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

@@ -15,5 +15,5 @@ public class LoginParam {
 
     private String jpushId;
 
-    private String appId;
+    private String appid;
 }

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

@@ -150,7 +150,7 @@ public class UserController extends  AppBaseController {
     public R editUser(@RequestBody @Valid FsUserEditParam param, HttpServletRequest request){
         param.setUserId(Long.parseLong(getUserId()));
         log.info("【修改用户头像昵称】:{}",param);
-        if (param.getNickName().length()>50){
+        if (param.getNickname().length()>50){
             return R.error("请授权正确的昵称!");
         }
         if (StringUtils.isEmpty(param.getAvatar())){
@@ -159,7 +159,7 @@ public class UserController extends  AppBaseController {
         FsUser user=new FsUser();
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
-        user.setNickName(param.getNickName());
+        user.setNickName(param.getNickname());
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }

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

@@ -3,7 +3,6 @@ package com.fs.app.param;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -12,7 +11,7 @@ import java.io.Serializable;
 public class FsUserEditParam implements Serializable {
 
     @NotNull(message = "用户昵称不能为空!")
-    private String nickName;
+    private String nickname;
 
     //    @NotBlank(message = "用户头像不能为空!")
     private String avatar;