|
@@ -137,21 +137,24 @@ public class AdvertiserController {
|
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
|
public Result<IPage<Advertiser>> queryPageList(Advertiser advertiser,
|
|
public Result<IPage<Advertiser>> queryPageList(Advertiser advertiser,
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
- @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
|
|
|
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
|
Result<IPage<Advertiser>> result = new Result<>();
|
|
Result<IPage<Advertiser>> result = new Result<>();
|
|
|
String userId = advertiser.getUserId();
|
|
String userId = advertiser.getUserId();
|
|
|
advertiser.setUserId(null);
|
|
advertiser.setUserId(null);
|
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
|
|
|
+ String roleCode = null;
|
|
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
|
|
+ roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
String name = advertiser.getName();
|
|
String name = advertiser.getName();
|
|
|
advertiser.setName(null);
|
|
advertiser.setName(null);
|
|
|
QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
|
|
QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
|
|
|
if (!Check.isNull(name)) {
|
|
if (!Check.isNull(name)) {
|
|
|
- queryWrapper.like("name", name);
|
|
|
|
|
|
|
+ queryWrapper.like("name", name.trim());
|
|
|
}
|
|
}
|
|
|
- if (!"admin".equals(roleCode)) {
|
|
|
|
|
|
|
+ if (!Check.isNull(userId) && !"admin".equals(roleCode)) {
|
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
userCompanyQueryWrapper.eq("user_id", userId);
|
|
userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
userCompanyQueryWrapper.orderByDesc("create_time");
|
|
userCompanyQueryWrapper.orderByDesc("create_time");
|