1

src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -92,9 +92,10 @@ public class LaserController extends BaseController{
         sceneParam.setPageNum(1);
         sceneParam.setPageSize(99999);
         sceneParam.setType(10);
-        sceneParam.setCompanyId(user.getCompanyId());
-
-        if(!roleIds.contains(6L) && roleIds.contains(5L)){
+        if(!roleIds.contains(5L)){
+            sceneParam.setCompanyId(user.getCompanyId());
+        }
+        if(!roleIds.contains(6L) && !roleIds.contains(5L)){
             sceneParam.setUserId(user.getId());
         }
         Page<SceneVo> page = sceneProMapper.pageList(new Page<>(sceneParam.getPageNum(),sceneParam.getPageSize()),sceneParam);