feats

src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java

@@ -57,6 +57,8 @@ public class TaPersonController extends BaseController {
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.nested(q -> q.and(qa -> qa.isNotNull("nickname").ne("nickname", ""))
+                .or(qb -> qb.isNotNull("phone").ne("phone", "")));
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);

src/main/java/com/yunzhi/liyuanhui/service/impl/TaPersonServiceImpl.java

@@ -59,6 +59,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.nested(q -> q.and(qa -> qa.isNotNull("nickname").ne("nickname", ""))
+                .or(qb -> qb.isNotNull("phone").ne("phone", "")));
         queryWrapper.orderByDesc("create_date");
         return this.list(queryWrapper);
     }