xiewenjie 3 سال پیش
والد
کامیت
17e0aab8f6
1فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 3 3
      sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/SceneStyleController.java

+ 3 - 3
sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/SceneStyleController.java

@@ -224,9 +224,9 @@ public class SceneStyleController extends BaseController {
         onewrapper.orderByDesc(SceneStyleEntity::getNum);
 
         SceneStyleEntity one = sceneStyleService.getOne(onewrapper);
-        res.put("title", ObjectUtil.isNotNull(one.getStyleName()) ? one.getStyleName() : "");
-        res.put("sceneNum", ObjectUtil.isNotNull(one.getSceneNum()) ? one.getSceneNum() : "");
-        res.put("styleNum", ObjectUtil.isNotNull(one.getStyleNum()) ? one.getStyleNum() : "");
+        res.put("title", ObjectUtil.isNotNull(one) && ObjectUtil.isNotNull(one.getStyleName()) ? one.getStyleName() : "");
+        res.put("sceneNum", ObjectUtil.isNotNull(one) && ObjectUtil.isNotNull(one.getSceneNum()) ? one.getSceneNum() : "");
+        res.put("styleNum", ObjectUtil.isNotNull(one) && ObjectUtil.isNotNull(one.getStyleNum()) ? one.getStyleNum() : "");
         if (ObjectUtil.isNotNull(collect)) {
             res.put("styleList", collect);
         }