Browse Source

更新1.6.0,fix null

xiewj 1 year ago
parent
commit
b5a830a4dc

+ 1 - 1
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -1071,7 +1071,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
                     JSONArray scenes = res.getJSONArray("scenes");
                     JSONArray scenes = res.getJSONArray("scenes");
                 for (int i = 0; i < scenes.size(); i++) {
                 for (int i = 0; i < scenes.size(); i++) {
                     JSONObject parse = JSON.parseObject(scenes.get(i).toString());
                     JSONObject parse = JSON.parseObject(scenes.get(i).toString());
-                    if (parse.getString("type").equalsIgnoreCase("pano")) {
+                    if (parse.containsKey("type")&&parse.getString("type").equalsIgnoreCase("pano")) {
                         if (res.containsKey("customMask")) {
                         if (res.containsKey("customMask")) {
                             JSONObject customMask = res.getJSONObject("customMask");
                             JSONObject customMask = res.getJSONObject("customMask");
                             JSONObject earth = customMask.getJSONObject("earth");
                             JSONObject earth = customMask.getJSONObject("earth");