Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -328,7 +328,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             });
             result.add(score);
         });
-        factIndexCommunityScoreDao.insertCommunityPartyRecord(result);
+        if (!CollectionUtils.isEmpty(result)){
+            factIndexCommunityScoreDao.insertCommunityPartyRecord(result);
+        }
         return true;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -357,7 +357,9 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             });
             result.add(score);
         });
-        agencyScoreDao.insertStreetRecord(result);
+        if (!CollectionUtils.isEmpty(result)){
+            agencyScoreDao.insertStreetRecord(result);
+        }
         return true;
     }