Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -151,7 +151,13 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
         entity.setKeyAreaType(StrConstant.EPMETY_STR);
         entity.setRegionScale(StrConstant.EPMETY_STR);
         entity.setIsKeyareaState(StrConstant.EPMETY_STR);
-        entity.setIsKeyPeopleLocate(NumConstant.ONE == record.getIsKeyPeopleLocate()?"Y":"N");
+
+
+        Integer isKeyPeopleLocate = record.getIsKeyPeopleLocate();
+        if (isKeyPeopleLocate != null){
+            entity.setIsKeyPeopleLocate(NumConstant.ONE == isKeyPeopleLocate ?"Y":"N");
+        }
+
         entity.setKeyPeopleStatus(record.getKeyPeopleStatus());
         entity.setHappenPlace(record.getAddress());
         entity.setLng(record.getLongitude());