Merge branch 'fix/o2_fix' into 'wrdp'

页面保存错误修复

See merge request o2oa/o2oa!2215

o2web/source/x_component_portal_PageDesigner/Main.js

@@ -1391,8 +1391,8 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
         widgetList = [];
 
         Object.each(data.moduleList, function(moudle){
-            if (moudle.moduleName.toLowerCase()=="widget"){
-                if (moudle.widgetType == "select"){
+            if (moudle.type.toLowerCase()=="widget"){
+                if (moudle.widgetType == "select" && moudle.widgetSelected ){
                     widgetList.push(moudle.widgetSelected);
                 }
             }