فهرست منبع

Merge branch 'fix/Query.view_identityList' into 'release'

Merge of fix/[数据中心]修复视图范围选择组织、人员、身份的时候报错的问题 to release

See merge request o2oa/o2oa!905

(cherry picked from commit 38c7a08e1280be2bd027857be73efaf7e224351f)

bae6046f 修复视图范围选择组织、人员、身份的时候报错的问题
蔡祥熠 5 سال پیش
والد
کامیت
dfe51e79a0
1فایلهای تغییر یافته به همراه42 افزوده شده و 42 حذف شده
  1. 42 42
      o2web/source/x_component_query_ViewDesigner/View.js

+ 42 - 42
o2web/source/x_component_query_ViewDesigner/View.js

@@ -655,27 +655,27 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
             return false;
             return false;
         }
         }
 
 
-        var list;
-        if( this.data.data && this.data.data.where ){
-            if( this.data.data.where.creatorIdentityList ){
-                list = this.data.data.where.creatorIdentityList;
-                for( var i=0; i< list.length ; i++){
-                    if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                }
-            }
-            if( this.data.data.where.creatorPersonList ){
-                list = this.data.data.where.creatorPersonList;
-                for( var i=0; i< list.length ; i++){
-                    if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                }
-            }
-            if( this.data.data.where.creatorUnitList ){
-                list = this.data.data.where.creatorIdentityList;
-                for( var i=0; i< list.length ; i++){
-                    if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                }
-            }
-        }
+        // var list;
+        // if( this.data.data && this.data.data.where ){
+        //     if( this.data.data.where.creatorIdentityList ){
+        //         list = this.data.data.where.creatorIdentityList;
+        //         for( var i=0; i< list.length ; i++){
+        //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+        //         }
+        //     }
+        //     if( this.data.data.where.creatorPersonList ){
+        //         list = this.data.data.where.creatorPersonList;
+        //         for( var i=0; i< list.length ; i++){
+        //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+        //         }
+        //     }
+        //     if( this.data.data.where.creatorUnitList ){
+        //         list = this.data.data.where.creatorIdentityList;
+        //         for( var i=0; i< list.length ; i++){
+        //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+        //         }
+        //     }
+        // }
 
 
         this.designer.actions.saveView(this.data, function(json){
         this.designer.actions.saveView(this.data, function(json){
             this.data.id = json.data.id;
             this.data.id = json.data.id;
@@ -696,27 +696,27 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
         //}
         //}
 
 
         debugger;
         debugger;
-            var list;
-            if( this.data.data && this.data.data.where ){
-                if( this.data.data.where.creatorIdentityList ){
-                    list = this.data.data.where.creatorIdentityList;
-                    for( var i=0; i< list.length ; i++){
-                        if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                    }
-                }
-                if( this.data.data.where.creatorPersonList ){
-                    list = this.data.data.where.creatorPersonList;
-                    for( var i=0; i< list.length ; i++){
-                        if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                    }
-                }
-                if( this.data.data.where.creatorUnitList ){
-                    list = this.data.data.where.creatorUnitList;
-                    for( var i=0; i< list.length ; i++){
-                        if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
-                    }
-                }
-            }
+            // var list;
+            // if( this.data.data && this.data.data.where ){
+            //     if( this.data.data.where.creatorIdentityList ){
+            //         list = this.data.data.where.creatorIdentityList;
+            //         for( var i=0; i< list.length ; i++){
+            //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+            //         }
+            //     }
+            //     if( this.data.data.where.creatorPersonList ){
+            //         list = this.data.data.where.creatorPersonList;
+            //         for( var i=0; i< list.length ; i++){
+            //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+            //         }
+            //     }
+            //     if( this.data.data.where.creatorUnitList ){
+            //         list = this.data.data.where.creatorUnitList;
+            //         for( var i=0; i< list.length ; i++){
+            //             if( typeOf( list[i] ) === "object" )list[i] = list[i].name || "";
+            //         }
+            //     }
+            // }
 
 
         this.designer.actions.saveView(this.data, function(json){
         this.designer.actions.saveView(this.data, function(json){
             this.designer.notice(this.designer.lp.notice.save_success, "success", this.node, {"x": "left", "y": "bottom"});
             this.designer.notice(this.designer.lp.notice.save_success, "success", this.node, {"x": "left", "y": "bottom"});