Index: src/main/groovy/com/lemans/pricecalc/services/catalog/CatalogService.groovy =================================================================== diff -u -r2fafb157a6eed184c2146c9cfbbd2c6be1a7220a -rc432469c163b4622e03dd37bd65ea7f1a560412c --- src/main/groovy/com/lemans/pricecalc/services/catalog/CatalogService.groovy (.../CatalogService.groovy) (revision 2fafb157a6eed184c2146c9cfbbd2c6be1a7220a) +++ src/main/groovy/com/lemans/pricecalc/services/catalog/CatalogService.groovy (.../CatalogService.groovy) (revision c432469c163b4622e03dd37bd65ea7f1a560412c) @@ -113,7 +113,7 @@ private static Map catalogQuerySelectAndJoin(Map criteria) { List joins = [] if (criteria._is_pc_manager_ || criteria._is_pc_buyer_) { - joins << 'INNER JOIN dbo.vwPart p WITH(NOLOCK) ON p.partNumber = cp.partNumber INNER JOIN vwVendor v WITH(NOLOCK) ON v.vendorId = p.vendorId' + joins << 'INNER JOIN dbo.vwPart p WITH(NOLOCK) ON p.partNumber = cp.partNumber' } [joins: joins] } @@ -147,8 +147,8 @@ private List catalogPartCountClauses(Map criteria) { List clauses = [] if (criteria.catalogId) { clauses << "c.catalogId IN (${criteria.catalogId.join(', ')})" } - if (criteria._is_pc_manager_) { clauses << 'v.buyerManagerGlobalId = :username' } - if (criteria._is_pc_buyer_) { clauses << 'v.buyerGlobalId = :username' } + if (criteria._is_pc_manager_) { clauses << 'p.buyerManagerGlobalId = :username' } + if (criteria._is_pc_buyer_) { clauses << 'p.buyerGlobalId = :username' } if (criteria.year) { clauses << 'c.year = :year' } if (criteria.catalogCodeId) { clauses << 'c.catalogCodeId = :catalogCodeId' } clauses << 'c.dateDeleted IS NULL'