房屋管理，gov/org/icneighborhood/neighborhood-options v2

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

@@ -682,9 +682,15 @@
         WHERE
             h.DEL_FLAG = '0'
           AND h.CUSTOMER_ID = #{customerId}
-          AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) )
-          and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
-          and h.GRID_ID=#{gridId}
+        <if test=" null != agencyId and agencyId != ''">
+            AND ( h.AGENCY_ID = #{agencyId} OR h.AGENCY_PIDS LIKE concat( '%', #{agencyId}, '%' ) )
+        </if>
+        <if test=" null != neighborHoodName and neighborHoodName != ''">
+            and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
+        </if>
+        <if test=" null != gridId and gridId != ''">
+            and h.GRID_ID=#{gridId}
+        </if>
         ORDER BY
             h.NEIGHBOR_HOOD_NAME ASC
     </select>