Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin

2022-11-11 14:48:03 +08:00
parent eaa13a4fbf f758694397
commit 718817d9fa
48 changed files with 254 additions and 144 deletions
@@ -663,7 +663,7 @@ class programModel extends model

                $programName = isset($programList[$programID]) ? $programList[$programID] : '';

-                $projectList[$id]->name = $programName . '/' . $projectList[$id]->name;
+                if($programName) $projectList[$id]->name = $programName . '/' . $projectList[$id]->name;
            }
        }
        return $projectList;