diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
index 029fb23169..235c9e2d70 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
@@ -70,7 +70,9 @@
                 AND ie.GRID_ID = #{orgId}
             </if>
             <if test='"agency" == orgType'>
-                AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+                <if test='null != orgId and "" != orgId'>
+                    AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+                </if>
             </if>
             <if test='null==orgType or "" == orgType'>
                 AND (