Merge branch 'cherry-pick-c436cde7' into 'develop'

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

See merge request o2oa/o2oa!1597

o2web/source/x_component_Selector/IdentityWidthDuty.js

@@ -267,7 +267,7 @@ MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory = new Class({
                         }.bind(this));
                     }.bind(this));
                 }
-                if (callback) callback();
+                // if (callback) callback();
 
             }else{
                 this.selector.orgAction.listIdentityWithDuty(function(json){

o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js

@@ -316,7 +316,13 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
         }.bind(this), failure, key);
     },
     _getItem: function(callback, failure, id, async){
-        if (callback) callback.apply(this, [id]);
+        if( typeOf(id) === "string" ){
+            this.orgAction.getIdentity(function(json){
+               if (callback) callback.apply(this, [json]);
+            }.bind(this), failure, ((typeOf(id)==="string") ? id : id.distinguishedName), async);
+        }else{
+            if (callback) callback.apply(this, [id]);
+        }
         //this.orgAction.getIdentity(function(json){
         //    if (callback) callback.apply(this, [json]);
         //}.bind(this), failure, ((typeOf(id)==="string") ? id : id.distinguishedName), async);

o2web/source/x_component_process_Work/Processor.js

@@ -318,13 +318,10 @@ MWF.xApplication.process.Work.Processor = new Class({
         this.routeSelectorArea.empty();
         //}
         this.selectedRoute = null;
-
-        var flag = true;
-
         //this.task.routeNameList = ["送审核", "送办理", "送公司领导阅"];
         if( !routeList )routeList = this.getRouteDataList();
         //this.task.routeNameList.each(function(route, i){
-        var flag = false;
+        var isSelected = false;
         routeList.each(function(route, i){
             if( route.hiddenScriptText && this.form && this.form.Macro ){
                 if( this.form.Macro.exec(route.hiddenScriptText, this).toString() === "true" )return;
@@ -347,13 +344,10 @@ MWF.xApplication.process.Work.Processor = new Class({
 
             if (routeList.length==1 || route.sole ){ //sole表示优先路由
                 this.selectRoute(routeNode);
-                flag = false;
-            }else{
-                flag = true;
+                isSelected = true;
             }
-
         }.bind(this));
-        if( flag ){
+        if( !isSelected ){
             this.setSize(0);
         }
     },