Merge branch 'test'

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -562,7 +562,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //设置协作者信息
         if(sceneVoPage.getRecords().size() >0){
             List<String> numList = sceneVoPage.getRecords().parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
-            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList, param.getIsObj() ==1 ?"mesh":"laser");
+            //HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList, param.getIsObj() ==1 ?"mesh":"laser");
+            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList,"mesh");
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if (StringUtils.isNotBlank(vo.getNum())) {
                     List<User> userVos = cooMap.get(vo.getNum());