* fix bug for check unique module.

This commit is contained in:
wangyidong
2018-02-28 10:54:46 +08:00
parent e3fae8dffe
commit f228dcf456
+1 -1
View File
@@ -1477,7 +1477,7 @@ class treeModel extends model
if(empty($branches)) $branches = $this->post->branch;
$branches = array_unique($branches);
if($this->isMergeModule($rootID, $viewType)) $viewType .= ',story';
if($this->isMergeModule($rootID, $viewType) and $viewType != 'task') $viewType .= ',story';
$existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->andWhere('branch')->in($branches)->andWhere('deleted')->eq(0)->fetchAll();
$repeatName = '';