|
|
@@ -553,10 +553,14 @@ public class QwUserController extends BaseController
|
|
|
public TableDataInfo queryQwList(QwUser qwUser)
|
|
|
{
|
|
|
startPage();
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
if(qwUser.getCompanyId() == null){
|
|
|
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
}
|
|
|
+ if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
|
|
|
+ qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
+ qwUser.setCompanyUserId(loginUser.getUser().getUserId());
|
|
|
+ }
|
|
|
List<QwUser> list = qwUserService.selectQwUserList(qwUser);
|
|
|
return getDataTable(list);
|
|
|
}
|