|
@@ -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);
|
|
|
}
|