Merge remote-tracking branch 'origin/dev_0521yzm' into dev_temp

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -425,18 +425,18 @@
 
     <select id="checkAgencyName" parameterType="map" resultType="com.epmet.entity.CustomerAgencyEntity">
         SELECT
-            ca.id
+        ca.id
         FROM
-            customer_agency ca
+        customer_agency ca
         WHERE
-            ca.DEL_FLAG = '0'
+        ca.DEL_FLAG = '0'
-            AND ca.CUSTOMER_ID = #{customerId}
+        AND ca.CUSTOMER_ID = #{customerId}
-            AND ca.ORGANIZATION_NAME = #{agencyName}
+        AND ca.ORGANIZATION_NAME = #{agencyName}
-            <if test='agencyId != "" and agencyId != null'>
+        <if test='agencyId != "" and agencyId != null'>
-                AND ca.id !=#{agencyId}
+            AND ca.id !=#{agencyId}
-            </if>
+        </if>
-            <if test='parentAgencyId != "" and parentAgencyId != null'>
+        <if test='parentAgencyId != "" and parentAgencyId != null'>
-                AND ca.pid =#{parentAgencyId}
+            AND ca.pid =#{parentAgencyId}
-            </if>
+        </if>
     </select>
 </mapper>