From 8604636eb2547e005ebf9dbe181900b62e81cb03 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 7b95860..e95f113 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -71,7 +71,7 @@
public List<PoleXixunPlayerEntity> listProgram(BaseConditionVO baseConditionVO, Integer order, Integer seq, String keyword) {
LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = XixunPlayerList(keyword);
//鎺掑簭瀛楁
- String orderByResult = "id";
+ String orderByResult = "program_id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
@@ -96,7 +96,9 @@
}
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
return list(wrapper);
}
@@ -260,10 +262,12 @@
layerPro.getSources().forEach(sourcePro -> {
long fileId = Long.parseLong(sourcePro.getId());
LedSFile file = xiXunFileService.getById(fileId);
- String fileUrl = file.getFileUrl();
- String[] split = fileUrl.split("/");
- sourcePro.setId(split[split.length - 1]);
- sourcePro.setMd5(file.getMd5());
+ if(file != null){
+ String fileUrl = file.getFileUrl();
+ String[] split = fileUrl.split("/");
+ sourcePro.setId(split[split.length - 1]);
+ sourcePro.setMd5(file.getMd5());
+ }
});
});
} catch (Exception e) {
--
Gitblit v1.9.3