|
|
@ -16,7 +16,7 @@ import com.hxhq.business.service.IStudyService; |
|
|
import com.hxhq.common.core.utils.ServletUtils; |
|
|
import com.hxhq.common.core.utils.ServletUtils; |
|
|
import com.hxhq.system.dto.UserExportDto; |
|
|
import com.hxhq.system.dto.UserExportDto; |
|
|
import com.hxhq.system.form.UserSaveForm; |
|
|
import com.hxhq.system.form.UserSaveForm; |
|
|
import com.hxhq.system.service.ISysConfigService; |
|
|
|
|
|
|
|
|
import com.hxhq.system.service.*; |
|
|
import org.apache.commons.lang3.ArrayUtils; |
|
|
import org.apache.commons.lang3.ArrayUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.validation.annotation.Validated; |
|
|
import org.springframework.validation.annotation.Validated; |
|
|
@ -47,11 +47,6 @@ import com.hxhq.system.api.domain.SysDept; |
|
|
import com.hxhq.system.api.domain.SysRole; |
|
|
import com.hxhq.system.api.domain.SysRole; |
|
|
import com.hxhq.system.api.domain.SysUser; |
|
|
import com.hxhq.system.api.domain.SysUser; |
|
|
import com.hxhq.system.api.model.LoginUser; |
|
|
import com.hxhq.system.api.model.LoginUser; |
|
|
import com.hxhq.system.service.ISysDeptService; |
|
|
|
|
|
import com.hxhq.system.service.ISysPermissionService; |
|
|
|
|
|
import com.hxhq.system.service.ISysPostService; |
|
|
|
|
|
import com.hxhq.system.service.ISysRoleService; |
|
|
|
|
|
import com.hxhq.system.service.ISysUserService; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 用户信息 |
|
|
* 用户信息 |
|
|
@ -84,6 +79,8 @@ public class SysUserController extends BaseController |
|
|
private TokenService tokenService; |
|
|
private TokenService tokenService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private IStudyService studyService; |
|
|
private IStudyService studyService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ISysMenuService sysMenuService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 获取用户列表 |
|
|
* 获取用户列表 |
|
|
@ -174,6 +171,7 @@ public class SysUserController extends BaseController |
|
|
sysUserVo.setSysUser(sysUser); |
|
|
sysUserVo.setSysUser(sysUser); |
|
|
sysUserVo.setRoles(roles); |
|
|
sysUserVo.setRoles(roles); |
|
|
sysUserVo.setPermissions(permissions); |
|
|
sysUserVo.setPermissions(permissions); |
|
|
|
|
|
sysUserVo.setDefaultUrl(sysMenuService.getUserFirstUrl(sysUser.getUserId())); |
|
|
return R.ok(sysUserVo); |
|
|
return R.ok(sysUserVo); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|