Parcourir la source

Merge branch 'fix/Selector.select_duty_execption' into 'wrdp'

Merge of fix/Selector.select_duty_execption 修复选人组件某些情况下选择职务报500错的问题 to wrdp

See merge request o2oa/o2oa!1846
蔡祥熠 il y a 5 ans
Parent
commit
2569257a56
1 fichiers modifiés avec 9 ajouts et 1 suppressions
  1. 9 1
      o2web/source/x_component_Selector/IdentityWidthDuty.js

+ 9 - 1
o2web/source/x_component_Selector/IdentityWidthDuty.js

@@ -75,6 +75,8 @@ MWF.xApplication.Selector.IdentityWidthDuty = new Class({
                     if (unitName)unitList.push( unitName )
                 });
 
+                debugger;
+
                 if( !this.options.expandSubEnable ){
                     this.allUnitNames = unitList;
                     loadDuty();
@@ -85,7 +87,13 @@ MWF.xApplication.Selector.IdentityWidthDuty = new Class({
                             var unitNames = [];
                             //排序
                             if( this.options.units.length === 1 ){
-                                unitNames = unitList.concat( json1.data );
+                                // unitNames = unitList.concat( json1.data );
+                                unitNames = Array.clone(unitList);
+                                for( var i=0; i<json1.data.length; i++ ){
+                                    if( !unitNames.contains(json1.data[i].distinguishedName) ){
+                                        unitNames.push( json1.data[i].distinguishedName );
+                                    }
+                                }
                             }else{
                                 unitObjectList.each( function ( u ) {
                                     unitNames.push( u.distinguishedName || u.unique || u.id || u.levelName );