Просмотр исходного кода

Merge branch 'fix/MainPage.component_error' into 'wrdp'

Merge of fix/MainPage.component_error 修复系统设置中组件中设置群组无效的问题 to wrdp

See merge request o2oa/o2oa!3013
蔡祥熠 5 лет назад
Родитель
Сommit
c383e41eda
1 измененных файлов с 6 добавлено и 1 удалено
  1. 6 1
      o2web/source/o2_core/o2/xDesktop/Default.js

+ 6 - 1
o2web/source/o2_core/o2/xDesktop/Default.js

@@ -1208,7 +1208,12 @@ o2.xDesktop.Default.StartMenu = new Class({
         if (user.roleList) currentNames = currentNames.concat(user.roleList);
         if (user.roleList) currentNames = currentNames.concat(user.roleList);
         // if (user.groupList) currentNames = currentNames.concat(user.groupList);
         // if (user.groupList) currentNames = currentNames.concat(user.groupList);
         o2.Actions.load("x_organization_assemble_express").GroupAction.listWithPerson(
         o2.Actions.load("x_organization_assemble_express").GroupAction.listWithPerson(
-            {  personList: [user.distinguishedName] },
+            {
+                personList: [user.distinguishedName],
+                recursiveGroupFlag : true,
+                referenceFlag : true,
+                recursiveOrgFlag : true
+            },
             function(json) {
             function(json) {
                 currentNames = currentNames.concat(json.data.groupList);
                 currentNames = currentNames.concat(json.data.groupList);
                 if( callback )callback( currentNames )
                 if( callback )callback( currentNames )