|
@@ -10,7 +10,9 @@ import com.usky.system.controller.web.page.TableDataInfo;
|
|
|
import com.usky.system.domain.SysDept;
|
|
|
import com.usky.system.domain.SysRole;
|
|
|
import com.usky.system.domain.SysUser;
|
|
|
+import com.usky.system.domain.SysUserTenant;
|
|
|
import com.usky.system.domain.constants.UserConstants;
|
|
|
+import com.usky.system.mapper.SysUserTenantMapper;
|
|
|
import com.usky.system.service.ISysDeptService;
|
|
|
import com.usky.system.service.ISysPostService;
|
|
|
import com.usky.system.service.ISysRoleService;
|
|
@@ -29,7 +31,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 用户信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @author yq
|
|
|
*/
|
|
|
@RestController
|
|
@@ -48,6 +50,9 @@ public class SysUserController extends BaseController
|
|
|
@Autowired
|
|
|
private ISysDeptService deptService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysUserTenantMapper sysUserTenantMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 获取用户列表
|
|
|
*/
|
|
@@ -174,8 +179,17 @@ public class SysUserController extends BaseController
|
|
|
user.setUserType("00");
|
|
|
user.setTenantId(user.getTenantId());
|
|
|
user.setCreateBy(user.getUserName());
|
|
|
+ user.setTenantId(user.getTenantId());
|
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
int row = userService.insertUser(user);
|
|
|
+
|
|
|
+ // 新增用户岗位关联数据
|
|
|
+ SysUserTenant sysUserTenant = new SysUserTenant();
|
|
|
+ sysUserTenant.setUserId(user.getUserId());
|
|
|
+ sysUserTenant.setIsDefault(true);
|
|
|
+ sysUserTenant.setTenantId(user.getTenantId());
|
|
|
+ sysUserTenantMapper.insert(sysUserTenant);
|
|
|
+
|
|
|
return toAjax(row);
|
|
|
}
|
|
|
|