From 235921d820f29b04b1e82f6a6f0d4a1957a900ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 12:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index ff5e5ab..0fa4be7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -904,7 +904,8 @@
if (focus.getStateValid() != null || focus.getTaobaoBind() != null || focus.getWeixinBind() != null
|| focus.getMinFansNum() != null || focus.getMinFansNum() != null
|| focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null
- || focus.getMinIncome() != null || focus.getMaxIncome() != null || !StringUtil.isNullOrEmpty(focus.getKey()))
+ || focus.getMinIncome() != null || focus.getMaxIncome() != null
+ || !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))
return true;
return false;
@@ -1247,6 +1248,7 @@
threeSaleExtraInfoSerivce.insertSelective(saleExtraInfo);
}
+ // 鏇存柊绮変笣璁板綍淇℃伅
teamFansInfoService.updateTags(workerId, type, tags);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
--
Gitblit v1.8.0