Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java

@@ -281,7 +281,12 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
 
     private Boolean insertNewRecordBatch(List<PatrolRoutineWorkResult> list){
         List<GridstaffWorkInfoPingyinEntity> insertList = new ArrayList<>();
-        list.forEach(o-> insertList.add(buildNewEntity(o)));
+        list.forEach(o-> {
+            if (StringUtils.isBlank(o.getGridCode())){
+                return;
+            }
+            insertList.add(buildNewEntity(o));
+        });
         //insert
         if (CollectionUtils.isEmpty(insertList)){
             log.error("新构建要插入的数据为空，param:{}", JSON.toJSONString(list));