Merge branch 'fix/MDomItem' into 'master'

修复flatStyle可能为空导致不加载默认skin-pc的问题

See merge request o2oa/o2oa!1396

(cherry picked from commit a9abec49)

51f60e05 修复flatStyle可能为空导致不加载默认skin-pc的问题

o2web/source/o2_core/o2/xDesktop/Common.js

@@ -69,12 +69,10 @@ MWF.xDesktop.getUserLayout = function(callback){
                 if (callback) callback();
             }else{
                 MWF.UD.getPublicData("defaultLayout", function(json) {
-                    if (json){
-                        layout.userLayout = json || {};
-                        if( !layout.userLayout.flatStyle )layout.userLayout.flatStyle = "blue";
-                        if( !layout.userLayout.apps )layout.userLayout.apps = {};
-                        if (forceStatus) layout.userLayout.apps = Object.merge(layout.userLayout.apps, forceStatus.apps);
-                    }
+                    layout.userLayout = json || {};
+                    if( !layout.userLayout.flatStyle )layout.userLayout.flatStyle = "blue";
+                    if( !layout.userLayout.apps )layout.userLayout.apps = {};
+                    if (forceStatus) layout.userLayout.apps = Object.merge(layout.userLayout.apps, forceStatus.apps);
                     if (callback) callback();
                 }.bind(this));
             }