Updated code

2024-11-21 15:11:41 +05:30
parent 2cc9ad5e23
commit 65bc02223d
2 changed files with 6 additions and 3 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -337,8 +337,11 @@ public class ApplicationDao {
                        .collect(Collectors.toList());
                predicate = builder.and(predicate, root.get("status").in(statusNames));
            }
-            predicate = builder.and(predicate, builder.equal(root.get("hubId"), userEntity.getHub().getId()));
-            query.orderBy(builder.desc(root.get(GepafinConstant.CREATED_DATE)));
+            query.orderBy(
+                    builder.desc(builder.isNotNull(root.get(GepafinConstant.SUBMISSION_DATE))),
+                    builder.desc(root.get(GepafinConstant.SUBMISSION_DATE))
+            );
+
            return predicate;
 		};
 	}