|
@@ -24,6 +24,7 @@ import com.fdkankan.manage.vo.response.SSDownSceneVo;
|
|
import com.fdkankan.manage.vo.response.SceneVo;
|
|
import com.fdkankan.manage.vo.response.SceneVo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.bouncycastle.jcajce.provider.asymmetric.rsa.AlgorithmParametersSpi;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -60,6 +61,9 @@ public class LaserService {
|
|
if(param.getUserId() != null){
|
|
if(param.getUserId() != null){
|
|
laserSceneParam.setUserId(param.getUserId());
|
|
laserSceneParam.setUserId(param.getUserId());
|
|
}
|
|
}
|
|
|
|
+ if(param.getUserIds() != null && param.getUserIds().size()>0){
|
|
|
|
+ laserSceneParam.setOtherUserIds(param.getUserIds());
|
|
|
|
+ }
|
|
if(StringUtils.isNotBlank(param.getUserName())){
|
|
if(StringUtils.isNotBlank(param.getUserName())){
|
|
List<User> likeUserName = userService.getLikeUserName(param.getUserName());
|
|
List<User> likeUserName = userService.getLikeUserName(param.getUserName());
|
|
List<Long> userIds = likeUserName.stream().map(User::getId).collect(Collectors.toList());
|
|
List<Long> userIds = likeUserName.stream().map(User::getId).collect(Collectors.toList());
|