diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java index 93c195d6..ce6c13d4 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -9,6 +9,7 @@ import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseMedicineMarketService; import com.peanut.modules.master.service.CourseService; import com.peanut.modules.master.service.CourseToMedicineMarketService; @@ -136,12 +137,12 @@ public class CourseMedicineMarketController { * 获取未关联课程列表 */ @RequestMapping("/getNotToMarketList") - public R getNotToMarketList(@RequestBody Map params){ - List collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, params.get("marketId"))).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList()); + public R getNotToMarketList(@RequestBody ParamTo param){ + List collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(CourseToMedicineMarketEntity::getMedicineMarketId, param.getId())).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList()); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.notIn(collect1.size()>0,CourseEntity::getId,collect1); - wrapper1.like(StringUtils.isNotBlank(params.get("title").toString()),CourseEntity::getTitle,params.get("title").toString()); - Page page1 = courseService.page(new Page<>(Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper1); + wrapper1.like(StringUtils.isNotBlank(param.getKeywords()),CourseEntity::getTitle,param.getKeywords()); + Page page1 = courseService.page(new Page<>(param.getPage(), param.getLimit()), wrapper1); return R.ok().put("page",page1); }