|
@@ -1077,7 +1077,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
|
|
|
JSONObject earth = customMask.getJSONObject("earth");
|
|
|
JSONObject sky = customMask.getJSONObject("sky");
|
|
|
JSONObject customMaskJson = new JSONObject();
|
|
|
- if (earth.containsKey("icon")&&ObjectUtil.isNotNull(earth.getString("icon"))&&StrUtil.isNotEmpty(earth.getString("icon"))) {
|
|
|
+ if (ObjectUtil.isNotNull(earth)&&earth.containsKey("icon")&&ObjectUtil.isNotNull(earth.getString("icon"))&&StrUtil.isNotEmpty(earth.getString("icon"))) {
|
|
|
earth.put("antidistorted", true);
|
|
|
earth.put("scale", 1);
|
|
|
customMaskJson.put("earth", earth);
|
|
@@ -1091,7 +1091,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
|
|
|
customMaskJson.put("earth", earth);
|
|
|
}
|
|
|
|
|
|
- if (sky.containsKey("icon")&&ObjectUtil.isNotNull(sky.getString("icon"))&&StrUtil.isNotEmpty(sky.getString("icon"))) {
|
|
|
+ if (ObjectUtil.isNotNull(sky)&&sky.containsKey("icon")&&ObjectUtil.isNotNull(sky.getString("icon"))&&StrUtil.isNotEmpty(sky.getString("icon"))) {
|
|
|
sky.put("antidistorted", true);
|
|
|
sky.put("scale", 1);
|
|
|
customMaskJson.put("sky", sky);
|