提交 452e2180 编写于 作者: 蔡祥熠

Merge branch 'hotfix/Selector.multi_identity' into 'master'

Merge of hotfix/Selector.multi_identity 修复同时选择身份及组织时,身份按职务按部门候选不正确的问题 to master

See merge request o2oa/o2oa!3793
......@@ -490,8 +490,12 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
if ((type.toLowerCase()==="unit") && ( options.unitType)){
t = "UnitWithType";
}
if ((type.toLowerCase()==="identity") && (( options.dutys) && options.dutys.length && options.categoryType.toLowerCase()==="duty")){
t = "IdentityWidthDuty";
if ((type.toLowerCase()==="identity") && (( options.dutys) && options.dutys.length)){
if( options.categoryType.toLowerCase()==="duty" ){
t = "IdentityWidthDuty";
}else{
t = "IdentityWidthDutyCategoryByUnit"
}
}
MWF.xDesktop.requireApp("Selector", t, function(){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册