|
@@ -54,6 +54,7 @@ public class KuaishouLandpagePackageServiceImpl extends ServiceImpl<KuaishouLand
|
|
|
private ICtopOauthTokenService oauthTokenService;
|
|
|
@Autowired
|
|
|
private ISysRoleExtService sysRoleService;
|
|
|
+
|
|
|
@Override
|
|
|
public Result<Object> queryPageList(KuaishouLandpagePackage kuaishouLandpagePackage, Integer pageNo, Integer pageSize) {
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
@@ -62,12 +63,12 @@ public class KuaishouLandpagePackageServiceImpl extends ServiceImpl<KuaishouLand
|
|
|
userId = user.getId();
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
//角色为管理员、销售、媒介可以查看所有项目信息
|
|
|
- if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
|
|
|
+ if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
|
|
|
userId = null;
|
|
|
}
|
|
|
}
|
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
|
- List<JSONObject> list = landpagePackageMapper.queryPageList(userId,kuaishouLandpagePackage.getAccountId(), kuaishouLandpagePackage.getProjectId());
|
|
|
+ List<JSONObject> list = landpagePackageMapper.queryPageList(userId, kuaishouLandpagePackage.getAccountId(), kuaishouLandpagePackage.getProjectId());
|
|
|
return Result.ok(new PageInfo<JSONObject>(list));
|
|
|
}
|
|
|
|
|
@@ -106,7 +107,7 @@ public class KuaishouLandpagePackageServiceImpl extends ServiceImpl<KuaishouLand
|
|
|
|
|
|
}
|
|
|
} else {
|
|
|
- log.error(resultJson.getString("message")+",accountId:"+accountId);
|
|
|
+ log.error(resultJson.getString("message") + ",accountId:" + accountId);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -150,7 +151,7 @@ public class KuaishouLandpagePackageServiceImpl extends ServiceImpl<KuaishouLand
|
|
|
|
|
|
@Override
|
|
|
public Result<Object> getRelatedGroups(Long siteId, Long accountId) {
|
|
|
- List<JSONObject> list = landpagePackageMapper.getRelatedGroups(siteId,accountId);
|
|
|
+ List<JSONObject> list = landpagePackageMapper.getRelatedGroups(siteId, accountId);
|
|
|
return Result.ok(new PageInfo<JSONObject>(list));
|
|
|
}
|
|
|
|