Merge branch 'feature/community-center' into preview

mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysUserController.java

@@ -280,8 +280,8 @@ public class SysUserController extends BaseController
     @PostMapping("/updateUserInfo")
     public AjaxResult updateUserInfo(@RequestBody SysUser sysUser){
 
-        userService.updateUserInfo(sysUser);
-        return AjaxResult.success("修改成功");
+
+        return userService.updateUserInfo(sysUser);
     }
 
     /**

mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java

@@ -211,7 +211,7 @@ public interface ISysUserService
 
     void addUser(String openid,String type,String phone);
 
-    void updateUserInfo(SysUser sysUser);
+    AjaxResult updateUserInfo(SysUser sysUser);
 
     SysUser selectUserInfoById(Long userId);
 

mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java

@@ -611,13 +611,19 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
-    public void updateUserInfo(SysUser sysUser) {
+    public AjaxResult updateUserInfo(SysUser sysUser) {
 
         if (sysUser.getInvitationCode() != null){
             Long aLong = ShareCodeUtils.codeToId(sysUser.getInvitationCode());
             sysUser.setInviterUserId(aLong);
+            if (aLong == SecurityUtils.getUserId()){
+
+                return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"邀请人不能填自己");
+            }
         }
         userMapper.updateUserInfo(sysUser);
+
+        return AjaxResult.success("修改成功");
     }
 
     @Override