(대표님) 20250715 협력사 정기평가, spreadJS, roles 서비스에 함수 추가

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/evaluation-submit/service.ts b/lib/evaluation-submit/service.ts
index 99c5cb5e..21ceb36f 100644
--- a/lib/evaluation-submit/service.ts
+++ b/lib/evaluation-submit/service.ts
@@ -16,7 +16,7 @@ import {
   reviewerEvaluationAttachments,
   users
 } from "@/db/schema";
-import { and, asc, desc, eq, ilike, or, SQL, count , sql, avg, isNotNull} from "drizzle-orm";
+import { and, inArray, asc, desc, eq, ilike, or, SQL, count , sql, avg, isNotNull} from "drizzle-orm";
 import { filterColumns } from "@/lib/filter-columns";
 import { DEPARTMENT_CATEGORY_MAPPING, EvaluationFormData,  GetSHIEvaluationsSubmitSchema, REVIEWER_TYPES, ReviewerType } from "./validation";
 import { AttachmentInfo, EvaluationQuestionItem } from "@/types/evaluation-form";
@@ -421,18 +421,18 @@ export async function getSHIEvaluationSubmissions(input: GetSHIEvaluationsSubmit
       );
     }
 
-    const existingReviewer = await db.query.evaluationTargetReviewers.findFirst({
+    const existingReviewer = await db.query.evaluationTargetReviewers.findMany({
       where: eq(evaluationTargetReviewers.reviewerUserId, userId),
     });
 
 
-
     const finalWhere = and(
       advancedWhere,
       globalWhere,
-      eq(reviewerEvaluationsView.evaluationTargetReviewerId, existingReviewer?.id),
+      inArray(reviewerEvaluationsView.evaluationTargetReviewerId, existingReviewer.map(e => e.id)),
     );
 
+
     // 정렬
     const orderBy = input.sort.length > 0
       ? input.sort.map((item) => {
@@ -458,7 +458,6 @@ export async function getSHIEvaluationSubmissions(input: GetSHIEvaluationsSubmit
         .select({ count: count() })
         .from(reviewerEvaluationsView)
         .where(finalWhere);
-
       const total = totalResult[0]?.count || 0;
 
       return { data, total };