Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPublicServiceOrgDao.xml

@@ -62,7 +62,7 @@
           AND o.`NAME` LIKE concat( '%', #{name}, '%' )
         </if>
         <if test="null != categoryIds and categoryIds.size() > 0">
-            <foreach collection="categoryIds" item="categoryId" open="AND" separator="" close="">
+            <foreach collection="categoryIds" item="categoryId" open="AND (" separator="or" close=")">
                  m.CATEGORY_ID = #{categoryId}
             </foreach>
         </if>