|
@@ -525,9 +525,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
User user = userService.getByUserName(username);
|
|
|
param.setUserId(user.getId());
|
|
|
}
|
|
|
- if(!param.getSceneSource().contains("4") || !param.getSceneSource().contains("5")){
|
|
|
- param.setIsObj(0);
|
|
|
- }
|
|
|
+// if( !param.getSourceList().contains("4") || !param.getSourceList().contains("5")){
|
|
|
+// param.setIsObj(0);
|
|
|
+// }
|
|
|
Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
for (SceneVo record : sceneVoPage.getRecords()) {
|
|
|
if(param.getIsObj()== 0 && SceneSourceUtil.isLaser(record.getSceneSource())){
|