提交

src/main/java/cn/ezhizao/project/business/controller/SysDeptController.java

@@ -149,7 +149,7 @@ public class SysDeptController extends BaseController {
             turnover.setDeptId(sysDept.getDeptId());
             bizTurnoverService.save(turnover);
         }
-        return success();
+        return success(sysDept.getDeptId());
     }
 
     /**
@@ -227,7 +227,7 @@ public class SysDeptController extends BaseController {
         }
         sysDept.setUpdateBy(getUsername());
         sysDeptService.updateDept(sysDept);
-        return success();
+        return success(sysDept.getDeptId());
     }
 
     /**

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

@@ -129,7 +129,9 @@ public class SysUserController extends BaseController
         sysUser.setCreateBy(getUsername());
 //        sysUser.setPassword(SecurityUtils.encryptPassword(sysUser.getPassword()));
         sysUser.setUserType("02");
-        return success(sysUserService.insertUser(sysUser));
+        sysUserService.insertUser(sysUser);
+//        SysUser item = sysUserService.selectUserByUserNameAndTenantId(sysUser.getUserName(),sysUser.getTenantId());
+        return success(sysUser.getUserId());
     }
 
     /**
@@ -196,7 +198,8 @@ public class SysUserController extends BaseController
             return error("修改用户'" + sysUser.getUserName() + "'失败，邮箱账号已存在");
         }
         sysUser.setUpdateBy(getUsername());
-        return toAjax(sysUserService.updateUser(sysUser));
+        sysUserService.updateUser(sysUser);
+        return success(sysUser.getUserId());
     }
 
     /**

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -24,7 +24,12 @@ public interface SysUserMapper {
     SysUser checkEmailUnique(String email);
 
     SysUser checkUserNameUnique(String userName);
+
     List<SysUser> selectUserListByIds(List<Long> userIds);
+
     public int updateUser(SysUser user);
+
     public int deleteUserByIds(List<Long> userIds);
+
+    public SysUser selectUserByUserNameAndTenantId(String userName, Long tenantId);
 }

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -3,6 +3,8 @@ package cn.ezhizao.project.system.service;
 import cn.ezhizao.framework.aspectj.lang.annotation.DataScope;
 import cn.ezhizao.project.system.domain.SysUser;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -41,4 +43,6 @@ public interface ISysUserService {
 
     @DataScope(deptAlias = "d", userAlias = "u")
     List<SysUser> selectUserList(SysUser user);
+
+    SysUser selectUserByUserNameAndTenantId(@NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") String userName, Long tenantId);
 }

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -108,6 +108,12 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
     }
+
+    @Override
+    public SysUser selectUserByUserNameAndTenantId(String userName, Long tenantId) {
+        return userMapper.selectUserByUserNameAndTenantId(userName, tenantId);
+    }
+
     @Override
     @Transactional
     public int updateUser(SysUser user) {