From 29cdc73995e1f30c6da6a7c404323ee7a9bcdd37 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 5 Aug 2025 13:46:26 +0800 Subject: [PATCH] * Fix deliverable type list error. --- module/upgrade/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 3118ccfb32..bfdeb32881 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -11235,8 +11235,8 @@ class upgradeModel extends model ->andWhere('lang')->in(array($clientLang, 'all')) ->fetchPairs(); - $this->lang->design->typeList = array_merge($this->lang->design->typeList, $typeList); - $this->lang->design->plusTypeList = array_merge($this->lang->design->plusTypeList, $plusTypeList); + if($typeList) $this->lang->design->typeList = $typeList; + if($plusTypeList) $this->lang->design->plusTypeList = $plusTypeList; $modelList = array('waterfall', 'waterfallplus', 'ipd'); $moduleList = $this->dao->select('t1.id,t1.name,t2.projectModel,t2.id as workflowGroup')->from(TABLE_MODULE)->alias('t1')