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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -195,7 +195,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
         agencyInfos.forEach(a -> {
             a.setDateId(dateId);
             projectOrgDaily.forEach(p -> {
-                if (a.getAreaCode().equals(p.getAreaCode())){
+                if (a.getOrgId().equals(p.getOrgId())){
                     a.setBadTotal(p.getBadTotal() + a.getBadTotal());
                     a.setEvaluateTotal(p.getEvaluateTotal() + a.getEvaluateTotal());
                     a.setGoodTotal(p.getGoodTotal() + a.getGoodTotal());