|
@@ -469,12 +469,10 @@ public class FsUserServiceImpl implements IFsUserService
|
|
|
@Override
|
|
|
public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
|
|
|
|
|
|
- if (param.getUserId() != null) {
|
|
|
- CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
|
|
|
- if (companyUser.isAdmin()){
|
|
|
- param.setUserId(0L);
|
|
|
- param.setCompanyId(companyUser.getCompanyId());
|
|
|
- }
|
|
|
+ CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
|
|
|
+ if (companyUser!=null && companyUser.isAdmin()){
|
|
|
+ param.setUserId(0L);
|
|
|
+ param.setCompanyId(companyUser.getCompanyId());
|
|
|
}
|
|
|
List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
|
|
|
|