|
@@ -202,13 +202,7 @@ public class CheckPlanController extends AbstractController {
|
|
|
}
|
|
}
|
|
|
queryWrapper.apply(sql.toString());
|
|
queryWrapper.apply(sql.toString());
|
|
|
queryWrapper.orderByDesc(CheckPlan::getId);
|
|
queryWrapper.orderByDesc(CheckPlan::getId);
|
|
|
- Page<CheckPlan> page;
|
|
|
|
|
- lock.lock();
|
|
|
|
|
- try {
|
|
|
|
|
- page = checkPlanService.page(new Page<>(queryCheckPlanListParam.getPageNum(), queryCheckPlanListParam.getPageSize()), queryWrapper);
|
|
|
|
|
- }finally {
|
|
|
|
|
- lock.unlock();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ Page<CheckPlan> page = checkPlanService.page(new Page<>(queryCheckPlanListParam.getPageNum(), queryCheckPlanListParam.getPageSize()), queryWrapper);;
|
|
|
List<CheckPlan> records = page.getRecords();
|
|
List<CheckPlan> records = page.getRecords();
|
|
|
if (records!=null && !records.isEmpty()) {
|
|
if (records!=null && !records.isEmpty()) {
|
|
|
List<CheckPlanListVo> checkPlanListVos = BeanUtils.copyList2List(records, CheckPlanListVo.class);
|
|
List<CheckPlanListVo> checkPlanListVos = BeanUtils.copyList2List(records, CheckPlanListVo.class);
|