diff --git a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java index 63df50f9..68c80025 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java @@ -50,13 +50,14 @@ public class UserCertificateController { //小班自考证书列表 @RequestMapping("/userClassAndZKCertificateList") public R userClassAndZKCertificateList(@RequestBody Map params) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,UserCertificate::getUserId); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.leftJoin(UserCertificate.class,UserCertificate::getUserId,MyUserEntity::getId); wrapper.in(UserCertificate::getLabelId,5,8); + wrapper.notExists("select 1 from (select count(1) c,user_id from user_certificate where label_id in (13,19) group by user_id having c>1) s where s.user_id = t.id "); wrapper.select("count(1) as count,user_id userId,name,tel,email"); wrapper.groupBy(UserCertificate::getUserId); wrapper.orderByDesc("count"); - Page> certificatePage = userCertificateService.pageMaps(new Page<>( + Page> certificatePage = myUserService.pageMaps(new Page<>( Long.parseLong(params.get("current").toString()),Long.parseLong(params.get("limit").toString())),wrapper); for (Map map:certificatePage.getRecords()){ map.put("certificate",userCertificateService.list(new LambdaQueryWrapper()