|
@@ -149,6 +149,9 @@ public class CameraUtil {
|
|
|
// 视频拼接
|
|
|
if (!StringUtils.isBlank(s) || "null".equals(s)) {
|
|
|
List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
|
|
|
+ if (ObjectUtils.isEmpty(maps)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
for (Map<String, Object> map : maps) {
|
|
|
Object path = map.get("Path");
|
|
|
if (!ObjectUtils.isEmpty(path)) {
|