张延森 4 gadus atpakaļ
vecāks
revīzija
28f1f89c92

+ 2
- 0
src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java Parādīt failu

57
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
57
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
58
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
58
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
59
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
59
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
60
+        queryWrapper.nested(q -> q.and(qa -> qa.isNotNull("nickname").ne("nickname", ""))
61
+                .or(qb -> qb.isNotNull("phone").ne("phone", "")));
60
         queryWrapper.orderByDesc("create_date");
62
         queryWrapper.orderByDesc("create_date");
61
 
63
 
62
         IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
64
         IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);

+ 2
- 0
src/main/java/com/yunzhi/liyuanhui/service/impl/TaPersonServiceImpl.java Parādīt failu

59
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
59
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
60
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
60
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
61
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
61
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
62
+        queryWrapper.nested(q -> q.and(qa -> qa.isNotNull("nickname").ne("nickname", ""))
63
+                .or(qb -> qb.isNotNull("phone").ne("phone", "")));
62
         queryWrapper.orderByDesc("create_date");
64
         queryWrapper.orderByDesc("create_date");
63
         return this.list(queryWrapper);
65
         return this.list(queryWrapper);
64
     }
66
     }