From dec72a3cf8ebb14c659f962822cc098f0b352e15 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Fri, 19 Jul 2024 14:15:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20null=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/mapper/base/actiongroup-mapper.xml   |  8 ++++++--
 .../resources/sql/mapper/base/authority-mapper.xml     |  8 ++++++--
 .../resources/sql/mapper/base/department-mapper.xml    |  5 ++++-
 src/main/resources/sql/mapper/base/file-mapper.xml     |  1 +
 src/main/resources/sql/mapper/base/sigungu-mapper.xml  | 10 ++++++++--
 src/main/resources/sql/mapper/base/user-mapper.xml     |  6 +++---
 .../sql/mapper/fims/crdn/crdn-list-mapper.xml          |  8 ++++----
 .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml         |  6 +++---
 .../sql/mapper/fims/epst/epostGdntc-mapper.xml         |  2 +-
 .../sql/mapper/fims/epst/epostRcptReg-mapper.xml       |  2 +-
 .../sql/mapper/fims/epst/epostRcptRslt-mapper.xml      |  4 ++--
 .../sql/mapper/fims/excl/crdnReReg-mapper.xml          |  2 +-
 .../resources/sql/mapper/fims/excl/levyExcl-mapper.xml |  2 +-
 .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml          |  2 +-
 .../resources/sql/mapper/fims/levy/levy-mapper.xml     |  4 ++--
 .../resources/sql/mapper/fims/levy/rdct-mapper.xml     |  2 +-
 src/main/resources/sql/mapper/fims/mngt/ntc-mapper.xml |  2 +-
 .../resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml    |  2 +-
 .../resources/sql/mapper/fims/sndb/sndng-mapper.xml    |  6 +++---
 .../resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml |  2 +-
 .../resources/sql/mapper/fims/sndb/svbtc-mapper.xml    |  2 +-
 .../sql/mapper/fims/sprt/integrationSearch-mapper.xml  |  2 +-
 22 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/actiongroup-mapper.xml b/src/main/resources/sql/mapper/base/actiongroup-mapper.xml
index 224f6504..594ed991 100644
--- a/src/main/resources/sql/mapper/base/actiongroup-mapper.xml
+++ b/src/main/resources/sql/mapper/base/actiongroup-mapper.xml
@@ -17,8 +17,12 @@ SELECT A.GRP_ID
      , A.REG_DT
   FROM TB_ACTION_GRP A
 <where>
-<if test="groupIDs != null">AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
-<if test="by != null and term != null">AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+<if test="groupIDs != null">
+AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)
+</if>
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
+AND ${by} LIKE CONCAT('%', #{term}, '%')
+</if>
 </where>
 <include refid="utility.paging-suffix" />
 </sql>
diff --git a/src/main/resources/sql/mapper/base/authority-mapper.xml b/src/main/resources/sql/mapper/base/authority-mapper.xml
index d434112d..baa4a4d9 100644
--- a/src/main/resources/sql/mapper/base/authority-mapper.xml
+++ b/src/main/resources/sql/mapper/base/authority-mapper.xml
@@ -53,8 +53,12 @@ SELECT *
       FROM TB_AUTHORITY
 ) A
 <where>
-<if test="authIDs != null">AND AUTH_ID IN (<foreach collection="authIDs" item="authID" separator=",">#{authID}</foreach>)</if>
-<if test="by != null and term != null">AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+<if test="authIDs != null">
+AND AUTH_ID IN (<foreach collection="authIDs" item="authID" separator=",">#{authID}</foreach>)
+</if>
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
+AND ${by} LIKE CONCAT('%', #{term}, '%')
+</if>
 </where>
 <include refid="utility.orderBy"/>
 <include refid="utility.paging-suffix" />
diff --git a/src/main/resources/sql/mapper/base/department-mapper.xml b/src/main/resources/sql/mapper/base/department-mapper.xml
index fa8fab9c..cc715865 100644
--- a/src/main/resources/sql/mapper/base/department-mapper.xml
+++ b/src/main/resources/sql/mapper/base/department-mapper.xml
@@ -37,7 +37,10 @@
 <select id="selectDepartmentList" parameterType="map" resultType="dataobject">/* 부서 정보 목록 조회(departmentMapper.selectDepartmentList) */
 <include refid="utility.paging-prefix" />
 <include refid="select" />
-<where><if test="by != null and term != null"> AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+<where>
+  <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)"> 
+  AND ${by} LIKE CONCAT('%', #{term}, '%')
+  </if>
   <if test="sggID != null"> AND SGG_CD = #{sggID}</if>
   <if test="instCode != null"> AND INST_CD = #{instCode}</if>
   <if test="deptIDs != null"> AND DEPT_CD IN (<foreach collection="deptIDs" item="deptID" separator=",">#{deptID}</foreach>)</if>
diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index a2d2f1b5..5a564e37 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -32,6 +32,7 @@ SELECT INF_TYPE
 
 	   SELECT '100' INF_TYPE, 'attachment/violation' DIR UNION <!-- 단속 정보 -->
 	   SELECT '110' INF_TYPE, 'attachment/opinion' DIR UNION   <!-- 의견 진술 -->
+	   SELECT '120' INF_TYPE, 'attachment/rent' DIR UNION   <!-- 렌트카 첨부파일 -->
 	   SELECT '190' INF_TYPE, 'attachment/capture' DIR         <!-- 캡쳐용 동영상 -->
        ) FILE_DIRS
 </sql>
diff --git a/src/main/resources/sql/mapper/base/sigungu-mapper.xml b/src/main/resources/sql/mapper/base/sigungu-mapper.xml
index f034d48d..995ce5cd 100644
--- a/src/main/resources/sql/mapper/base/sigungu-mapper.xml
+++ b/src/main/resources/sql/mapper/base/sigungu-mapper.xml
@@ -45,7 +45,10 @@
 <select id="selectSigunguList" parameterType="map" resultType="dataobject">/* 시군구 목록 조회(sigunguMapper.selectSigunguList) */
 <include refid="utility.paging-prefix" />
 <include refid="select" />
-<where><if test="by != null and term != null"> AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+<where>
+  <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)"> 
+  AND ${by} LIKE CONCAT('%', #{term}, '%')
+  </if>
   <if test="sggIDs != null"> AND SGG_CD IN (<foreach collection="sggIDs" item="sggID" separator=",">#{sggID}</foreach>)</if>
   <if test="instCodes != null"> AND INST_CD IN (<foreach collection="instCodes" item="instCode" separator=",">#{instCode}</foreach>)</if>
   <if test="!includeAll">AND USE_YN = 'Y'</if></where>
@@ -54,7 +57,10 @@
 
 <select id="selectSigungus" parameterType="map" resultMap="sggRow">/* 시군구 객체 가져오기(sigunguMapper.selectSigungus) */
 <include refid="select" />
-<where><if test="by != null and term != null"> AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+<where>
+  <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)"> 
+  AND ${by} LIKE CONCAT('%', #{term}, '%')
+  </if>
   <if test="sggIDs != null">AND SGG_CD IN (<foreach collection="sggIDs" item="sggID" separator=",">#{sggID}</foreach>)</if>
   <if test="instCodes != null">AND INST_CD IN (<foreach collection="instCodes" item="instCode" separator=",">#{instCode}</foreach>)</if>
   <if test="!includeAll"> AND USE_YN = 'Y'</if></where>
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index e86c7cba..e526593e 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -80,7 +80,7 @@ SELECT A.USER_ID
   <include refid="cokr.xit.base.user.dao.DepartmentMapper.adminSggDept" />
   ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD 
 <where>
-	<if test="by != null and term != null">
+	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 		<choose>
 			<when test="by == 'userAccount'">
 	AND ${by} LIKE CONCAT('%', UPPER(#{term}), '%')
@@ -93,10 +93,10 @@ SELECT A.USER_ID
 	<if test="userIDs != null">
 	USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)
 	</if>
-	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@null2void(status) != ''">
+	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(status)">
 	AND STTS = #{status}
 	</if>
-	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@null2void(type) != ''">
+	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(type)">
 	AND CNTN_SE_CD = #{type}
 	</if>
 </where>
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml
index 8112e469..07e9752c 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml
@@ -162,7 +162,7 @@ AND CA.TOWNG_YN = #{towngYn}
     AND C.NXRP_CRDN_LINK_YN = 'N' AND (C.ATCH_FILE_CNT = 0 OR C.ATCH_FILE_CNT IS NULL)
     </if>
 </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
@@ -278,7 +278,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
         <if test="schRgtrCd != null"> AND C.MDFR = #{schRgtrCd} </if>
  	</if>
 </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
@@ -348,7 +348,7 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
 <if test="crdnInptSeCd != null">AND C.CRDN_INPT_SE_CD = #{crdnInptSeCd}</if>
 <if test="vhrno != null">AND C.VHRNO = #{vhrno}</if>
 <if test="schExclEnd == 'on'">AND C.CRDN_STTS_CD != '81'</if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
@@ -451,7 +451,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
    AND C.TASK_SE_CD = 'DPV'
    AND CA.PRK_PSBLTY_RSLT_CD = '0'
    AND C.CRDN_STTS_CD = '21'
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index 1b88a1ca..383bf592 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -188,7 +188,7 @@ WHERE C.DEL_YN = 'N'
 		<if test="schRegDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schRegDateTo} </if>
 	</if>
 </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
@@ -273,7 +273,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 		<if test="schRegDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schRegDateTo} </if>
 	</if>
 </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
@@ -472,7 +472,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 		<if test="schRegDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schRegDateTo} </if>
 	</if>
 </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml
index e5d2e0be..fddd856b 100644
--- a/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/epst/epostGdntc-mapper.xml
@@ -88,7 +88,7 @@
             <otherwise>
             </otherwise>
         </choose>
-        <if test="by != null and by != '' and term != null">
+        <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
             <choose>
                 <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                     <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml
index 771d840c..ff2a5649 100644
--- a/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/epst/epostRcptReg-mapper.xml
@@ -185,7 +185,7 @@
             <otherwise>
             </otherwise>
         </choose>
-        <if test="by != null and by != '' and term != null">
+        <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
             <choose>
                 <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                     <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
index 9ad83f69..7b58394c 100644
--- a/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/epst/epostRcptRslt-mapper.xml
@@ -100,7 +100,7 @@
             <otherwise>
             </otherwise>
         </choose>
-        <if test="by != null and by != '' and term != null">
+        <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
             <choose>
                 <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                     <include refid="dynamicSearch.start" />
@@ -201,7 +201,7 @@
             <otherwise>
             </otherwise>
         </choose>
-        <if test="by != null and by != '' and term != null">
+        <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
             <choose>
                 <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                     <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
index fa0ddd6a..a7762952 100644
--- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml
@@ -147,7 +147,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
index 2fdb5363..5f7c05e1 100644
--- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml
@@ -161,7 +161,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
index 2f6abce8..d33eb318 100644
--- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml
@@ -197,7 +197,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
index 89cd51bb..48116620 100644
--- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
@@ -250,7 +250,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
@@ -526,7 +526,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/levy/rdct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rdct-mapper.xml
index fb6b14f3..e9c63cea 100644
--- a/src/main/resources/sql/mapper/fims/levy/rdct-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/rdct-mapper.xml
@@ -159,7 +159,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/mngt/ntc-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/ntc-mapper.xml
index b9efd3ae..ce73ad87 100644
--- a/src/main/resources/sql/mapper/fims/mngt/ntc-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/mngt/ntc-mapper.xml
@@ -50,7 +50,7 @@ SELECT A.NTC_ID   <!-- 공지 ID -->
  <if test="sggCd != null and sggCd != ''">
    AND (A.SGG_CD = #{sggCd} OR A.SGG_CD = '' OR A.SGG_CD IS NULL)
  </if>
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
    AND A.${by} LIKE CONCAT('%',#{term},'%')
 </if>
 <include refid="utility.orderBy" />
diff --git a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
index f1173043..f78a3282 100644
--- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml
@@ -214,7 +214,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
index 61f2e869..0536dcd7 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
@@ -146,7 +146,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
@@ -354,7 +354,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
@@ -574,7 +574,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
index 05266aa3..b69478a9 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml
@@ -908,7 +908,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
index 95ca817c..a2f9d55b 100644
--- a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml
@@ -99,7 +99,7 @@
                 <otherwise>
                 </otherwise>
             </choose>
-            <if test="by != null and by != '' and term != null">
+            <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
                 <choose>
                     <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
                         <include refid="dynamicSearch.start" />
diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
index ea5e5cfe..f43fea12 100644
--- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml
@@ -285,7 +285,7 @@ LEFT OUTER JOIN TB_LEVY          L   ON (C.CRDN_ID  = L.CRDN_ID AND L.DEL_YN = '
 </if>
 
 <!-- 동적 검색 -->
-<if test="by != null and by != '' and term != null">
+<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(by) and @org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(term)">
 	<choose>
 		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
 			<include refid="dynamicSearch.start" />