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

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

@@ -710,6 +710,11 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      * @Date 09:26 2020-09-04
      **/
     private IndexDataMonthlyFormDTO setValueAbilityMonthlyFor(String IndexCode, BigDecimal weight, BigDecimal Score, IndexDataMonthlyFormDTO monthlyFormDTO){
+        // 部门表的 组织类别，不齐，所以为了防止空指针，先赋值 0
+        BigDecimal zero = new BigDecimal(NumConstant.ZERO);
+        monthlyFormDTO.setPartyDevWeight(zero);
+        monthlyFormDTO.setGovernAblityWeight(zero);
+        monthlyFormDTO.setServiceAblityWeight(zero);
         // 赋实际值
         if (IndexCodeEnum.DANG_JIAN_NENG_LI.getCode().equals(IndexCode)){
             // 党建能力