|
@@ -2,6 +2,7 @@ package com.ruoyi.system.controller;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -70,7 +71,7 @@ public class PosAppealController extends BaseController
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@Auth
|
|
@Auth
|
|
|
@GetMapping("/apiList")
|
|
@GetMapping("/apiList")
|
|
|
- public AjaxResult list(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size)
|
|
|
|
|
|
|
+ public AjaxResult list(@RequestHeader String token,@RequestParam(defaultValue = "",required = false)String ddId, @RequestParam Integer page, @RequestParam Integer size)
|
|
|
{
|
|
{
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String id = jwtUtil.getusid(token);
|
|
String id = jwtUtil.getusid(token);
|
|
@@ -78,6 +79,7 @@ public class PosAppealController extends BaseController
|
|
|
Page<PosAppeal> pageInput=new Page<>(page,size);
|
|
Page<PosAppeal> pageInput=new Page<>(page,size);
|
|
|
LambdaQueryWrapper<PosAppeal> query=new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<PosAppeal> query=new LambdaQueryWrapper<>();
|
|
|
query.eq(PosAppeal::getUserId,uid);
|
|
query.eq(PosAppeal::getUserId,uid);
|
|
|
|
|
+ query.eq(!StrUtil.isEmpty(ddId),PosAppeal::getDdId,ddId);
|
|
|
IPage<PosAppeal> result= posAppealService.page(pageInput,query);
|
|
IPage<PosAppeal> result= posAppealService.page(pageInput,query);
|
|
|
return success(result);
|
|
return success(result);
|
|
|
}
|
|
}
|