|
|
@@ -51,13 +51,6 @@ public class SysProfileController extends BaseController
|
|
|
public AjaxResult profile(@PathVariable String sscDomain)
|
|
|
{
|
|
|
LoginUser loginUser = tokenService.getLoginUser();
|
|
|
- /*String companyId = loginUser.getSysUser().getCompanyId();
|
|
|
- System.out.println("sscDomain1111111======>"+sscDomain);
|
|
|
- String username = SecurityUtils.getUsername();
|
|
|
- Map map =new HashMap();
|
|
|
- map.put("companyId",companyId);
|
|
|
- map.put("userName",username);
|
|
|
- SysUser user = userService.selectUserByUser(map);*/
|
|
|
AjaxResult ajax = AjaxResult.success(loginUser.getSysUser());
|
|
|
ajax.put("roleGroup", loginUser);
|
|
|
return ajax;
|
|
|
@@ -94,11 +87,6 @@ public class SysProfileController extends BaseController
|
|
|
String username = SecurityUtils.getUsername();
|
|
|
SysUser user = userService.selectUserByUserName(username);
|
|
|
|
|
|
- LoginUser users = tokenService.getLoginUser();
|
|
|
- String companyId = users.getSysUser().getCompanyId();
|
|
|
- if(!companyId.equals(user.getCompanyId())){
|
|
|
- return AjaxResult.error("角色所属公司不符,无权操作");
|
|
|
- }
|
|
|
String password = user.getPassword();
|
|
|
if (!SecurityUtils.matchesPassword(oldPassword, password))
|
|
|
{
|