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

Merge of fix/Selector.unit_search 修复人员选择框搜索组织的问题 to wrdp

See merge request o2oa/o2oa!4540

o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js

@@ -245,7 +245,7 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
         }, function (json) {
             this.allUnitObjectWithDuty = {};
             json.data.each(function (u) {
-                this.allUnitObjectWithDuty[u.levelName] = u;
+                if(u && u.levelName)this.allUnitObjectWithDuty[u.levelName] = u;
             }.bind(this));
             if (callback) callback();
         }.bind(this))

o2web/source/x_component_Selector/Unit.js

@@ -852,10 +852,11 @@ MWF.xApplication.Selector.Unit.Item = new Class({
 MWF.xApplication.Selector.Unit.SearchItem = new Class({
     Extends: MWF.xApplication.Selector.Unit.Item,
     load : function(){
-        this.loadForNormal();
+        this.loadForNormal(true);
     },
     _getShowName: function(){
-        return this.data.levelName || this.data.name;
+        // return this.data.levelName || this.data.name;
+        return this.data.name+((this.data.levelName) ? "("+this.data.levelName+")" : "");
     },
     loadSubItems: function( callback ){
         //只是为了在isFlatCategory模式下，加载全称用的，否则用继承的就可以

o2web/source/x_component_Selector/UnitWithType.js

@@ -304,10 +304,11 @@ MWF.xApplication.Selector.UnitWithType.SearchItem = new Class({
     //Extends: MWF.xApplication.Selector.Unit.Item,
     Extends: MWF.xApplication.Selector.UnitWithType.Item,
     load : function(){
-        this.loadForNormal();
+        this.loadForNormal(true);
     },
     _getShowName: function(){
-        return this.data.levelName || this.data.name;
+        // return this.data.levelName || this.data.name;
+        return this.data.name+((this.data.levelName) ? "("+this.data.levelName+")" : "");
     },
     loadSubItems: function( callback ){
     }