feature/FBR-710-QA (#1034)

* fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 * fix FSF-17 (#957) * fix FSF-15 * fix FSF-12 * fix FSF-19 * fix FSF-19 (#969) * Fix/fs 18 (#977) * fix FSF-19 * FIX FSF-18 * Fix/fsf 20 (#980) * fix FSF-19 * FIX FSF-18 * FIX FSF-20 * QA-FSF-18-20 * Fix/fsf 21 (#989) * FSF 22 * FSF 22 * Fix/fsf 21 (#990) * FSF 22 * FSF 22 * FSF 22 * FSF 23 (#992) * FBR-710 (#1000) * Fix/fsf 24 (#1014) * FBR-710 * FSF-24 * Feature/fbr 714 (#1018) * FBR-710 * FBR-714 * FSF-1 throw exception if debit and credit gl accounts are same (#1023) Co-authored-by: Faheem Ahmad <[email protected]> * fix/FSF-25 (#1025) * FBR-710 * FSF-25 * fix/FSF-28 (#1026) * FBR-710 * FSF-25 * FSF-28 * CHARGE FIX * fix/FBR-710 (#1031) * FBR-710 * FSF 710 * FBR 710 --------- Co-authored-by: Faheem Ahmad <[email protected]> Co-authored-by: Faheem Ahmad <[email protected]>
fiterlatam · Aug 19, 2024 · c2e709f · c2e709f
1 parent 62c3ab2
commit c2e709f
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/...neract/organisation/prequalification/service/PrequalificationReadPlatformServiceImpl.java b/...neract/organisation/prequalification/service/PrequalificationReadPlatformServiceImpl.java
@@ -291,14 +291,6 @@ private String buildSqlStringFromBlacklistCriteria(final SearchParameters search
             if (groupingType.equals("group")) {
                 extraCriteria += " and g.prequalification_type_enum = ? ";
                 paramList.add(PrequalificationType.GROUP.getValue());
-
-                Set<Role> roles = appUser.getRoles();
-                for (Role userRole : roles) {
-                    if (StringUtils.containsIgnoreCase(userRole.getName(), "Líder de agencia")) {
-                        extraCriteria += " and ma.responsible_user_id = ? ";
-                        paramList.add(appUser.getId());
-                    }
-                }
             }
 
             if (StringUtils.equals(groupingType, "individual")) {
@@ -309,16 +301,25 @@ private String buildSqlStringFromBlacklistCriteria(final SearchParameters search
                     paramList.add(dpiNumber);
                 }
             }
-            extraCriteria += " and (moind.hierarchy LIKE CONCAT(?, '%') OR ? like CONCAT(moind.hierarchy, '%'))";
-            paramList.add(appUser.getOffice().getHierarchy());
-            paramList.add(appUser.getOffice().getHierarchy());
+        }
 
-            if (agencyId != null) {
-                extraCriteria += " and individualOffice.agency_id = ? ";
-                paramList.add(agencyId);
+        Set<Role> roles = appUser.getRoles();
+        for (Role userRole : roles) {
+            if (StringUtils.containsIgnoreCase(userRole.getName(), "Líder de agencia")) {
+                extraCriteria += " and ma.responsible_user_id = ? ";
+                paramList.add(appUser.getId());
             }
         }
 
+        extraCriteria += " and (moind.hierarchy LIKE CONCAT(?, '%') OR ? like CONCAT(moind.hierarchy, '%'))";
+        paramList.add(appUser.getOffice().getHierarchy());
+        paramList.add(appUser.getOffice().getHierarchy());
+
+        if (agencyId != null) {
+            extraCriteria += " and individualOffice.agency_id = ? ";
+            paramList.add(agencyId);
+        }
+
         if (sqlSearch != null && !isGroup) {
             extraCriteria += " and (m.name like '%" + sqlSearch + "%' OR m.dpi='" + sqlSearch + "') ";
         }