From aa4bd17b2b985eceb8189cf11369e4c83f97636d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 12 May 2025 09:47:43 +0800 Subject: [PATCH] [sync story #73341] Sync code to this branch from feature/deliverable. --- module/group/packagemanager.php | 6 ++++-- module/transfer/tao.php | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index cd86ce98f9..f8c3e7e6e5 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -2114,8 +2114,10 @@ $config->group->package->programPlan = new stdclass(); $config->group->package->programPlan->order = 5; $config->group->package->programPlan->subset = 'programplan'; $config->group->package->programPlan->privs = array(); -$config->group->package->programPlan->privs['programplan-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-edit')); -$config->group->package->programPlan->privs['programplan-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-create')); +$config->group->package->programPlan->privs['programplan-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-edit')); +$config->group->package->programPlan->privs['programplan-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('programplan-browse'), 'recommend' => array('programplan-create')); +$config->group->package->programPlan->privs['programplan-exportTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('programplan-browse', 'project-execution'), 'recommend' => array()); +$config->group->package->programPlan->privs['programplan-import'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('programplan-browse', 'project-execution'), 'recommend' => array()); $config->group->package->browseDesign = new stdclass(); $config->group->package->browseDesign->order = 5; diff --git a/module/transfer/tao.php b/module/transfer/tao.php index b86762f803..bfe5c740a3 100644 --- a/module/transfer/tao.php +++ b/module/transfer/tao.php @@ -117,6 +117,12 @@ class transferTao extends transferModel $linkFieldName = $linkField . 'List'; $tmpFieldName = array(); + if(isset($_POST['cascade'][$field])) + { + $lists[$fieldName] = $_POST['cascade'][$field]; + continue; + } + if(empty($lists[$fieldName]) || empty($lists[$linkFieldName])) continue; /* 根据字段名获取表名。*/ @@ -133,11 +139,7 @@ class transferTao extends transferModel /* 将获取到的数据替换到lists中。*/ /* Replace data to lists. */ - foreach($fieldDatas as $id => $linkFieldID) - { - $tmpFieldName[$linkFieldID][$id] = $lists[$fieldName][$id]; - } - + foreach($fieldDatas as $id => $linkFieldID) $tmpFieldName[$linkFieldID][$id] = $lists[$fieldName][$id]; $lists[$fieldName] = $tmpFieldName; }