Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -15,6 +15,7 @@
                 AND D.DEL_FLAG='0'
                 and d.CUSTOMER_ID=#{customerId})
         WHERE M.DEL_FLAG = '0'
+        and m.level='1'
         AND M.ORG_ID = #{agencyId}
         and M.CUSTOMER_ID=#{customerId}
         AND M.DATE_ID = (
@@ -32,6 +33,5 @@
                         limit 1
         )
         ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc
-        limit 20
     </select>
 </mapper>