Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -453,18 +453,19 @@
         FROM
             project_category pc
             INNER JOIN project_related_personnel per ON ( pc.PROJECT_ID = per.PROJECT_ID )
-            INNER JOIN project p
+            INNER JOIN project p on(pc.project_id=p.id)
         WHERE
             pc.DEL_FLAG = '0'
             AND per.DEL_FLAG = '0'
             AND p.DEL_FLAG = '0'
             AND pc.CUSTOMER_ID = #{customerId}
             AND p.ORIGIN = 'issue'
+            and per.SOURCE_TYPE='topic'
             AND pc.PROJECT_ID != #{excludeProjectId}
+            AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
             <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
-                AND per.USER_ID = #{epmetUserId}
+                 per.USER_ID = #{epmetUserId}
             </foreach>
-            AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
         ORDER BY
             p.CREATED_TIME DESC
     </select>