浏览代码

调整封面

yumeng 4 年之前
父节点
当前提交
3b68103edf

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java

@@ -116,13 +116,15 @@ public class MaterialImageInfoController {
     @AutoLog(value = "素材-分页列表查询")
     @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<List<MaterialImageInfo>> queryPageList(String videoId,Integer status) {
+    public Result<List<MaterialImageInfo>> queryPageList(String videoId, Integer status) {
         Result<List<MaterialImageInfo>> result = new Result<>();
         List<MaterialImageInfo> list = new ArrayList<>();
         if (!Check.isNull(videoId)) {
             QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("video_id", videoId);
-            queryWrapper.eq("status", status);
+            if (!Check.isNull(status)) {
+                queryWrapper.eq("status", status);
+            }
             list = MaterialImageInfoService.list(queryWrapper);
         }
 

+ 2 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouTrackUrlCollectionController.java

@@ -76,11 +76,12 @@ public class KuaiShouTrackUrlCollectionController {
 
 
     @GetMapping(value = "/checkTrackName")
-    public Result<Boolean> checkTrackName(Long accountId, String trackName) {
+    public Result<Boolean> checkTrackName(Long accountId, String trackName,String userId) {
         Result<Boolean> result = new Result<>();
         QueryWrapper<KuaiShouTrackUrlCollection> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id", accountId);
         queryWrapper.eq("track_name", trackName);
+        queryWrapper.eq("user_id", userId);
         List<KuaiShouTrackUrlCollection> list = kuaiShouTrackUrlCollectionService.list(queryWrapper);
         if (Check.isNull(list)) {
             result.setResult(true);