|
|
@@ -5,6 +5,7 @@ import com.ruixuan.common.core.domain.AjaxResult;
|
|
|
import com.ruixuan.common.core.domain.entity.SysUser;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.common.utils.DateUtils;
|
|
|
+import com.ruixuan.common.utils.PageUtils;
|
|
|
import com.ruixuan.common.utils.RedisUtil;
|
|
|
import com.ruixuan.common.utils.http.HttpUtil;
|
|
|
import com.ruixuan.isc.entity.KuaishouPromoter;
|
|
|
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.Arrays;
|
|
|
+import java.util.Collections;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -61,7 +63,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
|
|
|
String roleKey = sysUserService.getRoleKeyByUserId(userId + "");
|
|
|
List<Long> userList = null;
|
|
|
//角色:供应链管理员、招商、招商经理可以看到所有的达人信息
|
|
|
- if (roleKey.contains("courtship") || "supplyChainAdmin".equals(roleKey)) {
|
|
|
+ if (roleKey.contains("courtship") || "supplyChainAdmin".equals(roleKey) || "admin".equals(roleKey)) {
|
|
|
|
|
|
} else if ("bdManager".equals(roleKey) || "associationManager".equals(roleKey)) {
|
|
|
// 渠道经理、社群经理 可以看到自己创建的以及自己部门人员的达人信息
|
|
|
@@ -70,10 +72,10 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
|
|
|
} else if ("bd".equals(roleKey) || "association".equals(roleKey)) {
|
|
|
// 渠道、社群 可以看到自己创建的达人信息
|
|
|
userList = Arrays.asList(userId);
|
|
|
-// } else {
|
|
|
-// return Collections.emptyList();
|
|
|
+ } else {
|
|
|
+ return Collections.emptyList();
|
|
|
}
|
|
|
-
|
|
|
+ PageUtils.startPage();
|
|
|
List<KuaishouPromoter> list = kuaishouPromoterMapper.selectKuaishouPromoterList(userList, promoterId, promoterNickName);
|
|
|
return list;
|
|
|
}
|
|
|
@@ -212,7 +214,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
|
|
|
public AjaxResult getPromoterInfo(Long promoterId) {
|
|
|
AjaxResult ajaxResult = null;
|
|
|
try {
|
|
|
- KuaishouPromoter promoter = kuaishouPromoterMapper.getOneByIdAndPromoterId(null,promoterId);
|
|
|
+ KuaishouPromoter promoter = kuaishouPromoterMapper.getOneByIdAndPromoterId(null, promoterId);
|
|
|
JSONObject data = new JSONObject();
|
|
|
if (Check.isNotNull(promoter)) {
|
|
|
Thread thread = new Thread() {
|