diff --git a/src/main/java/com/peanut/modules/master/controller/UserCourseBuyController.java b/src/main/java/com/peanut/modules/master/controller/UserCourseBuyController.java index 2424e230..84b76f08 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserCourseBuyController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserCourseBuyController.java @@ -45,8 +45,10 @@ public class UserCourseBuyController { "t.come,t.days,t.start_time startTime,t.end_time endTime,t.del_flag expire,t1.tel,t2.title courseName,t3.title catalogueName"); if (StringUtils.isNotEmpty(params.get("userInfo").toString())) { wrapper.and(t->t.like(MyUserEntity::getName,params.get("userInfo")).or().like(MyUserEntity::getNickname,params.get("userInfo")) - .or().like(MyUserEntity::getTel,params.get("userInfo")).or().like(MyUserEntity::getEmail,params.get("userInfo")) - .or().eq(MyUserEntity::getId,params.get("userInfo"))); + .or().like(MyUserEntity::getTel,params.get("userInfo")).or().like(MyUserEntity::getEmail,params.get("userInfo"))); + } + if (StringUtils.isNotEmpty(params.get("userId").toString())) { + wrapper.like(MyUserEntity::getId,params.get("userId")); } if (StringUtils.isNotEmpty(params.get("courseName").toString())) { wrapper.like(CourseEntity::getTitle,params.get("courseName")); @@ -77,7 +79,7 @@ public class UserCourseBuyController { String[] catalogueIds = catalogueId.split(","); for (String id : catalogueIds) { UserCourseBuyEntity userCourseBuyEntity = userCourseBuyService.getOne(new LambdaQueryWrapper() - .eq(UserCourseBuyEntity::getCatalogueId,catalogueId) + .eq(UserCourseBuyEntity::getCatalogueId,id) .eq(UserCourseBuyEntity::getUserId,userId)); if (userCourseBuyEntity==null){ userCourseBuyEntity = new UserCourseBuyEntity();