浏览代码

快手-查询条件调整

yumeng 5 年之前
父节点
当前提交
aca66a5a10

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 
+import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -75,7 +76,10 @@ public class KuaiShouCampaignTemplateController {
         Result<IPage<KuaiShouCampaignTemplate>> result = new Result<IPage<KuaiShouCampaignTemplate>>();
         QueryWrapper<KuaiShouCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignTemplate, req.getParameterMap());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("login_id", user.getId());
+        if(!Check.isNull(user)){
+            queryWrapper.eq("login_id", user.getId());
+        }
+
         Page<KuaiShouCampaignTemplate> page = new Page<KuaiShouCampaignTemplate>(pageNo, pageSize);
         IPage<KuaiShouCampaignTemplate> pageList = kuaiShouCampaignTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 
+import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -74,7 +75,10 @@ public class KuaiShouCreateAppTemplateController {
         Result<IPage<KuaiShouCreateAppTemplate>> result = new Result<IPage<KuaiShouCreateAppTemplate>>();
         QueryWrapper<KuaiShouCreateAppTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreateAppTemplate, req.getParameterMap());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("login_id", user.getId());
+        System.err.println(user);
+        if(!Check.isNull(user)){
+            queryWrapper.eq("login_id", user.getId());
+        }
         Page<KuaiShouCreateAppTemplate> page = new Page<KuaiShouCreateAppTemplate>(pageNo, pageSize);
         IPage<KuaiShouCreateAppTemplate> pageList = kuaiShouCreateAppTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 
+import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -75,7 +76,9 @@ public class KuaiShouGroupCreateLogController {
         Result<IPage<KuaiShouGroupCreateLog>> result = new Result<IPage<KuaiShouGroupCreateLog>>();
         QueryWrapper<KuaiShouGroupCreateLog> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateLog, req.getParameterMap());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("login_id", user.getId());
+        if (!Check.isNull(user)) {
+            queryWrapper.eq("login_id", user.getId());
+        }
         Page<KuaiShouGroupCreateLog> page = new Page<KuaiShouGroupCreateLog>(pageNo, pageSize);
         IPage<KuaiShouGroupCreateLog> pageList = kuaiShouGroupCreateLogService.page(page, queryWrapper);
         result.setSuccess(true);

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java

@@ -9,6 +9,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.ctop.common.utils.Check;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -69,9 +70,11 @@ public class KuaiShouImageController {
 									  HttpServletRequest req) {
 		Result<IPage<KuaiShouImage>> result = new Result<IPage<KuaiShouImage>>();
 
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		QueryWrapper<KuaiShouImage> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouImage, req.getParameterMap());
-		queryWrapper.eq("login_id", user.getId());
+		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if(!Check.isNull(user)){
+			queryWrapper.eq("login_id", user.getId());
+		}
 		Page<KuaiShouImage> page = new Page<KuaiShouImage>(pageNo, pageSize);
 		IPage<KuaiShouImage> pageList = kuaiShouImageService.page(page, queryWrapper);
 		result.setSuccess(true);

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 
+import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,9 +9,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kuaishou.entity.KuaiShouVideo;
 import org.jeecg.modules.kuaishou.service.IKuaiShouImageService;
@@ -112,6 +115,10 @@ public class KuaiShouVideoController {
                                                       HttpServletRequest req) {
         Result<IPage<KuaiShouVideo>> result = new Result<IPage<KuaiShouVideo>>();
         QueryWrapper<KuaiShouVideo> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouVideo, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!Check.isNull(user)) {
+            queryWrapper.eq("login_id", user.getId());
+        }
         Page<KuaiShouVideo> page = new Page<KuaiShouVideo>(pageNo, pageSize);
         IPage<KuaiShouVideo> pageList = kuaiShouVideoService.page(page, queryWrapper);
         result.setSuccess(true);

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

@@ -147,7 +147,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnMap.put("desc", "上传apk文件失败");
                     return returnMap;
                 }
-                System.err.println(apkMap);
                 groupJson.put("app_id", apkMap.get("appId"));
             }