Merge branch dev/bug-62582 of zentao/zentaopms (#13290)

module/program/model.php

@@ -999,8 +999,6 @@ class programModel extends model
         $treeMenu = array();
         foreach($programList as $program)
         {
-            if(!$this->app->user->admin && strpos($mode, 'all') === false && strpos(",{$this->app->user->view->programs},", ",{$program->id},") === false) continue;
-
             $programName = $showRoot ? '/' : '';
             $parentList  = explode(',', trim($program->path, ','));
             foreach($parentList as $parentID)
@@ -1029,7 +1027,10 @@ class programModel extends model
             if(strpos($menu, '|') === false) continue;
 
             list($label, $moduleID) = explode('|', $menu);
-            $lastMenu[$moduleID]    = str_replace('¦', '|', $label);
+
+            /* Ignore the no priv programs. */
+            if(!$this->app->user->admin && strpos($mode, 'all') === false && strpos(",{$this->app->user->view->programs},", ",{$moduleID},") === false) continue;
+            $lastMenu[$moduleID] = str_replace('¦', '|', $label);
         }
 
         return $lastMenu;

module/program/test/model/getparentpairs.php

@@ -1,5 +1,20 @@
 #!/usr/bin/env php
 <?php
+
+/**
+
+title=测试 programModel::getParentPairs();
+cid=17690
+pid=1
+
+- 获取所有父项目集的数量 @5
+- 获取瀑布类型父项目集的数量 @1
+- 获取ID为1的父项目集的名称属性1 @/项目集1
+- 获取父项目集的名称显示根目录 @0
+- 获取ID为1的父项目集的名称不显示根目录 @项目集1
+
+*/
+
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/lib/program.unittest.class.php';
 su('admin');
@@ -22,20 +37,6 @@ $program->end->range('20220212 000000:0')->type('timestamp')->format('YYYY-MM-DD
 $program->deleted->range('0{15},1{5}');
 $program->gen(10);
 
-/**
-
-title=测试 programModel::getParentPairs();
-cid=17690
-pid=1
-
-获取所有父项目集的数量 >> 5
-获取瀑布类型父项目集的数量 >> 1
-获取ID为1的父项目集的名称 >> /项目集1
-获取父项目集的名称显示根目录 >> 0
-获取ID为1的父项目集的名称不显示根目录 >> 项目集1
-
-*/
-
 $programTester = new programTest();
 
 $program1 = $programTester->getParentPairsTest();