|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruixuan.common.core.controller.BaseController;
|
|
|
import com.ruixuan.common.core.domain.AjaxResult;
|
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
|
+import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.common.utils.Result;
|
|
|
import com.ruixuan.isc.entity.KuaishouPromoter;
|
|
|
import com.ruixuan.isc.service.IKuaishouPromoterService;
|
|
@@ -54,7 +55,10 @@ public class KuaishouPromoterController extends BaseController {
|
|
|
|
|
|
) {
|
|
|
|
|
|
- List<KuaishouPromoter> list = kuaishouPromoterService.selectKuaishouPromoterList(userId, promoterId.trim(), promoterNickName, mediaId, parameter, orderBy);
|
|
|
+ if (Check.isNotNull(promoterId)) {
|
|
|
+ promoterId = promoterId.trim();
|
|
|
+ }
|
|
|
+ List<KuaishouPromoter> list = kuaishouPromoterService.selectKuaishouPromoterList(userId, promoterId, promoterNickName, mediaId, parameter, orderBy);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
@@ -69,7 +73,10 @@ public class KuaishouPromoterController extends BaseController {
|
|
|
@ApiParam("认领状态,1-认领,2-未认领") @RequestParam(value = "status", required = false) String status,
|
|
|
@ApiParam("排序参数") @RequestParam(value = "parameter", required = false) String parameter,
|
|
|
@ApiParam("正序倒叙") @RequestParam(value = "orderBy", required = false) String orderBy) {
|
|
|
- List<JSONObject> list = kuaishouPromoterService.selectKuaishouPromoterList2(bdUserId, promoterId.trim(), promoterNickName, status, parameter, orderBy);
|
|
|
+ if (Check.isNotNull(promoterId)) {
|
|
|
+ promoterId = promoterId.trim();
|
|
|
+ }
|
|
|
+ List<JSONObject> list = kuaishouPromoterService.selectKuaishouPromoterList2(bdUserId, promoterId, promoterNickName, status, parameter, orderBy);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
@@ -97,7 +104,8 @@ public class KuaishouPromoterController extends BaseController {
|
|
|
@GetMapping(value = "/getPromoterInfo")
|
|
|
@ApiOperation(value = "获取快手达人短视频信息")
|
|
|
public AjaxResult getPromoterInfo(@ApiParam("达人ID") @RequestParam(value = "promoterId", required = true) String promoterId) {
|
|
|
- return kuaishouPromoterService.getPromoterInfo(promoterId.trim());
|
|
|
+
|
|
|
+ return kuaishouPromoterService.getPromoterInfo(promoterId);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -107,7 +115,10 @@ public class KuaishouPromoterController extends BaseController {
|
|
|
@GetMapping(value = "/getOnlyPromoterInfo")
|
|
|
@ApiOperation(value = "只获取达人信息")
|
|
|
public AjaxResult getOnlyPromoterInfo(@ApiParam("达人ID") @RequestParam(value = "promoterId", required = true) String promoterId) {
|
|
|
- return AjaxResult.success(kuaishouPromoterService.getOnlyPromoterInfo(promoterId.trim()));
|
|
|
+ if (Check.isNotNull(promoterId)) {
|
|
|
+ promoterId = promoterId.trim();
|
|
|
+ }
|
|
|
+ return AjaxResult.success(kuaishouPromoterService.getOnlyPromoterInfo(promoterId));
|
|
|
}
|
|
|
|
|
|
/**
|