BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue in company document get endpoint

Browse Source
This commit is contained in:
rajesh
2025-11-18 16:59:43 +05:30
parent e8a59ce277
commit feca1e86bf
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/gepafin/tendermanagement/dao/CompanyDocumentDao.java
View File

@@ -333,6 +333,11 @@ public class CompanyDocumentDao {
predicate = builder.and(predicate, builder.isFalse(root.get("isDeleted")));
predicate = builder.and(
predicate,
builder.notEqual(root.get("status"), CompanyDocumentStatusEnum.EXPIRED.getValue())
);
if (typeEnum != null) {
if (typeEnum == CompanyDocumentTypeEnum.COMPANY_DOCUMENT) {
// Case 1: Fetch only COMPANY_DOCUMENT type documents for the given company
@@ -346,15 +351,15 @@ public class CompanyDocumentDao {
builder.equal(root.get("userWithCompany").get("userId"), userId)
);
}
}else {
// Case 3: If typeEnum is null, fetch all documents for the company and personal documents for the user
Predicate companyPredicate = builder.equal(root.get("companyId"), companyId);
Predicate personalPredicate = builder.and(
builder.equal(root.get("type"), CompanyDocumentTypeEnum.PERSONAL_DOCUMENT.getValue()),
builder.equal(root.get("userWithCompany").get("userId"), userId)
);
predicate = builder.and(predicate, builder.or(companyPredicate, personalPredicate));
}
// Case 3: If typeEnum is null, fetch all documents for the company and personal documents for the user
Predicate companyPredicate = builder.equal(root.get("companyId"), companyId);
Predicate personalPredicate = builder.and(
builder.equal(root.get("type"), CompanyDocumentTypeEnum.PERSONAL_DOCUMENT.getValue()),
builder.equal(root.get("userWithCompany").get("userId"), userId)
);
predicate = builder.and(predicate, builder.or(companyPredicate, personalPredicate));
predicate = builder.equal(root.get("status"), CompanyDocumentStatusEnum.VALID.getValue());
return predicate;
};
}