|
@@ -173,7 +173,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
User user = userService.getByUserName(param.getUserName());
|
|
|
Long userId = null;
|
|
|
Set<Long> roleIds = userRoleService.getByUser(user);
|
|
|
- if(!roleIds.contains(6L) || !roleIds.contains(5L)){
|
|
|
+ if(!roleIds.contains(6L) && !roleIds.contains(5L)){
|
|
|
userId = user.getId();
|
|
|
}
|
|
|
Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|