From 709c9fb1f42a70da66ab9b759014b009b1c67d95 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:03:30 +0900
Subject: [PATCH] 충돌 병합
---
src/main/resources/mybatis/query-template/department-template.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index 169e31b..23b0dfb 100644
--- a/src/main/resources/mybatis/query-template/department-template.xml
+++ b/src/main/resources/mybatis/query-template/department-template.xml
@@ -33,7 +33,7 @@
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.DepartmentCondition">
SELECT
- count(d.id)
+ count(DISTINCT d.id)
FROM
department d
WHERE 1=1
--
Gitblit v1.8.0