动态查询2

ch-dao/src/main/java/com/wwdz/ch/db/impl/qiandao/QdUserSignInNoteDaoImpl.java

@@ -46,15 +46,15 @@ public class QdUserSignInNoteDaoImpl implements QdUserSignInNoteDao {
     @Override
     public List<QdUserSignInNote> findSelfNoteByPage(QdUserSignInNoteRequestDto dto) {
         QdUserSignInNoteExample example = new QdUserSignInNoteExample();
-        QdUserSignInNoteExample.Criteria criteria = example.createCriteria();
-        JdbcHelper.ifPresent(dto.getTaskId(), criteria :: andTaskIdEqualTo);
-        criteria.andIsDeletedEqualTo(false);
-        criteria.andIsPrivateEqualTo(false);
-        if (dto.getOnlySelf() != null && dto.getOnlySelf()) {
         QdUserSignInNoteExample.Criteria orCriteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getUserId(), orCriteria :: andUserIdEqualTo);
         JdbcHelper.ifPresent(dto.getTaskId(), orCriteria :: andTaskIdEqualTo);
         orCriteria.andIsDeletedEqualTo(false);
+        if (dto.getOnlySelf() == null || !dto.getOnlySelf()) {
+            QdUserSignInNoteExample.Criteria criteria = example.or();
+            JdbcHelper.ifPresent(dto.getTaskId(), criteria::andTaskIdEqualTo);
+            criteria.andIsDeletedEqualTo(false);
+            criteria.andIsPrivateEqualTo(false);
         }
         if (StringUtils.hasLength(dto.getSortColumn())) {
             example.setOrderByClause(dto.getSortColumn() + " " + dto.getOrder());