Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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

@@ -56,7 +56,7 @@
             #{level} as orgType,
             od.DATE_ID
         FROM screen_project_category_org_daily od
-        LEFT JOIN customer_project_category_dict cd ON cd.CATEGORY_CODE = od.CATEGORY_CODE
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
         LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.PID
         WHERE 1=1
           AND od.DEL_FLAG = '0'