Merge remote-tracking branch 'origin/jskim-node' into jskim-node

; Conflicts:
;	frontend/app/(main)/COMPANY_30/sales/order/page.tsx
This commit is contained in:
DDD1542
2026-04-16 12:10:32 +09:00
68 changed files with 5886 additions and 533 deletions

View File

@@ -2367,26 +2367,24 @@ export class TableManagementService {
const total = parseInt(countResult[0].count);
// 데이터 조회 (main 별칭 추가)
const dataQuery = `
SELECT main.* FROM ${safeTableName} main
${whereClause}
${orderClause}
LIMIT $${paramIndex} OFFSET $${paramIndex + 1}
`;
// size=0 이면 LIMIT 없이 전체 반환 (마스터 참조 데이터 조회용)
const usePaging = size > 0;
const dataQuery = usePaging
? `SELECT main.* FROM ${safeTableName} main ${whereClause} ${orderClause} LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`
: `SELECT main.* FROM ${safeTableName} main ${whereClause} ${orderClause}`;
logger.info(`🔍 실행할 SQL: ${dataQuery}`);
logger.info(
`🔍 파라미터: ${JSON.stringify([...searchValues, size, offset])}`
);
const queryParams = usePaging ? [...searchValues, size, offset] : [...searchValues];
logger.info(`🔍 파라미터: ${JSON.stringify(queryParams)}`);
let data = await query<any>(dataQuery, [...searchValues, size, offset]);
let data = await query<any>(dataQuery, queryParams);
// 🎯 파일 컬럼이 있으면 파일 정보 보강
if (fileColumns.length > 0) {
data = await this.enrichFileData(data, fileColumns, safeTableName);
}
const totalPages = Math.ceil(total / size);
const totalPages = usePaging ? Math.ceil(total / size) : 1;
logger.info(
`테이블 데이터 조회 완료: ${tableName}, 총 ${total}건, ${data.length}개 반환`