|
|
@@ -180,7 +180,12 @@ public class FsUserController extends BaseController
|
|
|
public AjaxResult getInfo(@PathVariable("userId") Long userId)
|
|
|
{
|
|
|
FsUser fsUser = fsUserService.selectFsUserByUserId(userId);
|
|
|
- fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
|
|
|
+ if (fsUser != null) {
|
|
|
+ if (!checkCompanyScope(fsUser.getCompanyId())) {
|
|
|
+ return AjaxResult.error("无权限访问该用户数据");
|
|
|
+ }
|
|
|
+ fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
|
|
|
+ }
|
|
|
return AjaxResult.success(fsUser);
|
|
|
}
|
|
|
|
|
|
@@ -192,6 +197,10 @@ public class FsUserController extends BaseController
|
|
|
@GetMapping(value = "/getUserAddr/{userId}")
|
|
|
public AjaxResult getUserAddr(@PathVariable("userId") Long userId)
|
|
|
{
|
|
|
+ FsUser fsUser = fsUserService.selectFsUserByUserId(userId);
|
|
|
+ if (fsUser != null && !checkCompanyScope(fsUser.getCompanyId())) {
|
|
|
+ return AjaxResult.error("无权限访问该用户数据");
|
|
|
+ }
|
|
|
List<FsUserAddress> fsUserAddresses = fsUserService.selectFsUserAddressByUserId(userId);
|
|
|
for (FsUserAddress fsUserAddress : fsUserAddresses) {
|
|
|
fsUserAddress.setPhone(decryptAutoPhoneMk(fsUserAddress.getPhone()));
|
|
|
@@ -199,6 +208,16 @@ public class FsUserController extends BaseController
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 校验当前登录用户是否具备访问指定用户的权限(按所属企业 companyId)
|
|
|
+ */
|
|
|
+ private boolean checkCompanyScope(Long companyId) {
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
+ return loginUser != null && loginUser.getCompany() != null
|
|
|
+ && loginUser.getCompany().getCompanyId() != null
|
|
|
+ && loginUser.getCompany().getCompanyId().equals(companyId);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 新增用户
|