Resolved conflicts

This commit is contained in:
rajesh
2025-11-18 15:01:45 +05:30
parent 277663639d
commit e8a59ce277
15 changed files with 124 additions and 8 deletions

View File

@@ -354,7 +354,7 @@ public class CompanyDocumentDao {
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;
};
}