0611

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -259,8 +259,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
-        String tenantId = request.getHeader("tenantId");
-        user.setTenantId(Long.valueOf(tenantId));
+        user.setTenantId(user.getUsageCompanyId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNumber())
@@ -331,9 +330,9 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "save")
     @Transactional
     public AjaxResult save(@Validated @RequestBody SysUser user) {
-//        String tenantId = request.getHeader("tenantId");
-//        user.setTenantId(Long.valueOf(tenantId));
-        user.setTenantId(user.getUsageCompanyId());
+        String tenantId = request.getHeader("tenantId");
+        user.setTenantId(Long.valueOf(tenantId));
+//        user.setTenantId(user.getUsageCompanyId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNumber())
@@ -430,7 +429,6 @@ public class SysUserController extends BaseController {
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        user.setTenantId(user.getUsageCompanyId());
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUser(user));
     }