Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -608,7 +608,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 }
             }
             if ("".equals(parentAgencyId)) {
-                throw new RuntimeException("在screen_customer_dept表中未查询到该客户下的父级信息：customerId =" + customerId + ", deptId = " + deptScore.getKey());
+                log.error("在screen_customer_dept表中未查询到该客户下的父级信息：customerId =" + customerId + ", deptId = " + deptScore.getKey());
+                continue;
             }
             // 补充表中其他字段
             monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.DEPARTMENT, deptScore.getKey(),