|
|
@@ -579,7 +579,7 @@ public class SysUserController extends BaseController
|
|
|
* 根据用户编号获取详细信息
|
|
|
*/
|
|
|
@PreAuthorize(hasPermi = "system:user:query")
|
|
|
- @GetMapping(value = { "/", "/{userId}/{scyId}" })
|
|
|
+ @GetMapping(value = { "/", "/{userId}","/{userId}/{scyId}" })
|
|
|
public AjaxResult getInfo(
|
|
|
@PathVariable(value = "userId", required = false) Long userId,
|
|
|
@PathVariable(value = "scyId", required = false) String scyId
|
|
|
@@ -592,8 +592,6 @@ public class SysUserController extends BaseController
|
|
|
//角色
|
|
|
SysRole role = new SysRole();
|
|
|
role.setIsAuto("0");
|
|
|
- Map map = new HashMap<>();
|
|
|
- map.put("companyId",scyId);
|
|
|
if(CommonUtil.isNotEmpty(scyId)) {
|
|
|
role.setCompanyId(scyId);
|
|
|
}else {
|
sqg