|
|
@@ -41,11 +41,11 @@ public class FeishuAccountController extends BaseController {
|
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
if (account!=null&&account.getMyAccount()!=null&&"true".equals(account.getMyAccount())){
|
|
|
//如果用户勾选了"我的用户",则只查询当前用户的账户信息
|
|
|
- account.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
+ account.setCompanyId(loginUser.getUser().getCompanyId());
|
|
|
account.setCompanyUserId(loginUser.getUser().getUserId());
|
|
|
}
|
|
|
startPage();
|
|
|
- List<FeishuAccount> list = feishuAccountService.selectFeishuAccountList(account, loginUser.getCompany().getCompanyId());
|
|
|
+ List<FeishuAccount> list = feishuAccountService.selectFeishuAccountList(account, loginUser.getUser().getUserId());
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
|
@@ -66,8 +66,8 @@ public class FeishuAccountController extends BaseController {
|
|
|
// 设置所属公司(从当前登录用户获取)
|
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
if (loginUser != null && loginUser.getCompany() != null) {
|
|
|
- account.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
- account.setCompanyUserId(loginUser.getCompany().getUserId());
|
|
|
+ account.setCompanyId(loginUser.getUser().getCompanyId());
|
|
|
+ account.setCompanyUserId(loginUser.getUser().getUserId());
|
|
|
}
|
|
|
return toAjax(feishuAccountService.insertFeishuAccount(account));
|
|
|
}
|