瀏覽代碼

Merge remote-tracking branch 'origin/test' into test

songyh 4 年之前
父節點
當前提交
0d1e81bb00

+ 2 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/entity/AiBytedanceAdvertiserStrategy.java

@@ -109,6 +109,8 @@ public class AiBytedanceAdvertiserStrategy{
 	private String adGender;
 	/**年龄(用户定向)*/
 	private String adAge;
+	/**定向人群包类型  1-定向 2-排除 3-同时定向和排除*/
+	private String adRetargetingTagsType;
 	/**定向人群包(用户定向)*/
 	private String adRetargetingTagsInclude;
 	/**排除人群包(用户定向)*/

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/bytedance/advertise/controller/AiBytedanceAdvertiserStrategyController.java

@@ -411,8 +411,11 @@ public class AiBytedanceAdvertiserStrategyController {
 
 	@ApiOperation(value="获取人群包列表信息", notes="获取人群包列表信息")
 	@GetMapping(value = "/getDMPCustomAudience")
-	public Result getDMPCustomAudience(@RequestParam("accountId") String accountId) {
+	public Result getDMPCustomAudience(@RequestParam(value = "accountId",required = false) String accountId) {
 		try {
+			if (Check.isNull(accountId)){
+				return Result.errorMsg("请选择账户。");
+			}
 			return aiBytedanceAdvertiserStrategyService.getDMPCustomAudience(accountId);
 		}catch (Exception e){
 			log.error("获取人群包列表异常",e);