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

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

@@ -33,26 +33,21 @@
         <result property="contact" column="CONTACT"/>
         <result property="contactMobile" column="CONTACT_MOBILE"/>
         <result property="remark" column="REMARK"/>
-        <collection property="serviceMatterList" ofType="com.epmet.dto.IcPublicServiceOrgServiceMatterDTO" >
-            <result property="categoryId" column="CATEGORY_ID"/>
-            <result property="categoryCode" column="CATEGORY_CODE"/>
-            <result property="categoryName" column="CATEGORY_NAME"/>
+        <collection property="serviceMatterList" ofType="com.epmet.dto.IcPublicServiceOrgServiceMatterDTO"
+                    select="com.epmet.dao.IcPublicServiceOrgServiceMatterDao.selectServiceMatter" column="ID">
         </collection>
     </resultMap>
 
     <select id="pageList" parameterType="com.epmet.dto.form.IcPublicServiceOrgPageFormDTO" resultMap="IcPublicServiceOrgDetailResDTOMap">
         SELECT
-            o.ID,
+            distinct o.ID,
             o.`NAME`,
             o.AGENCY_ID,
             o.TYPE,
             ( CASE WHEN o.type = '1' THEN '实有单位' WHEN o.type = '2' THEN '社会服务组织' WHEN o.type = '3' THEN '志愿团队' end) AS typeName,
             o.CONTACT,
             o.CONTACT_MOBILE,
-            o.REMARK,
-            m.CATEGORY_ID,
-            m.CATEGORY_CODE,
-            d.CATEGORY_NAME
+            o.REMARK
         FROM
             ic_public_service_org o
                 LEFT JOIN ic_public_service_org_service_matter m ON ( o.id = m.ORG_ID and m.del_flag='0')