Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -200,6 +200,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                 String agencyId = issue.getAgencyId();
                 agencyIdSet.add(agencyId);
                 ScreenUserJoinEntity entity = insertMap.get(agencyId);
+                //todo 这里为什么会没有
+                if (entity == null){
+                    return;
+                }
                 entity.setJoinTotal(issue.getIssueIncr());
                 GridUserCountResultDTO user = userCountMap.get(agencyId);
                 //百人人均议题：统计周期内总的议题数/（注册用户数/100）

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

@@ -181,7 +181,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
     public void deleteAndInsertSelfSubScore(CalculateCommonFormDTO formDTO, String indexCode, Map<String, DeptSelfSubScoreEntity> insertMap) {
         int effectRow = 0;
         do {
-            deptSelfSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode);
+            effectRow = deptSelfSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode);
         } while (effectRow > 0);
 
         deptSelfSubScoreDao.insertBatch(new ArrayList<>(insertMap.values()));