1

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

@@ -311,7 +311,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(jyUser == null){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
             }
-            param.setUserId(jyUser.getUserId());
+            //param.setUserId(jyUser.getUserId());
             param.setUserIds(Arrays.asList(jyUser.getUserId()));
             List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
             if(list.size() >0){
@@ -329,7 +329,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(userIds.isEmpty()){
                 return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
             }
-            param.setUserIds(userIds);
+            if(!param.getUserIds().isEmpty()){
+                userIds.addAll(param.getUserIds());
+                param.setUserIds(userIds);
+            }
 
         }
         Page<SceneVo> page = null;