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

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

@@ -461,10 +461,10 @@
             AND pc.CUSTOMER_ID = #{customerId}
             AND p.ORIGIN = 'issue'
             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>