|
@@ -84,13 +84,14 @@ public class AdvertiserController {
|
|
|
|
|
|
Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
|
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
|
|
|
+ String userId = advertiser.getUserId();
|
|
|
if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode)) {
|
|
|
advertiser.setUserId(null);
|
|
|
}
|
|
|
QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
|
|
|
- if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)) {
|
|
|
+ if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode)) {
|
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
- userCompanyQueryWrapper.eq("user_id", advertiser.getUserId());
|
|
|
+ userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
userCompanyQueryWrapper.last("limit 1");
|
|
|
UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|