Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-03-22 11:47:44 +08:00
parent c7313cefd6 f9ec1f84fb
commit 28017454fa
24 changed files with 173 additions and 118 deletions
@@ -205,16 +205,17 @@ class block extends control
     *
     * @param  string    $module
     * @param  string    $type
+     * @param  int       $projectID
     * @access public
     * @return void
     */
-    public function dashboard($module, $type = '')
+    public function dashboard($module, $type = '', $projectID = 0)
    {
        if($this->loadModel('user')->isLogon()) $this->session->set('blockModule', $module);
        $blocks = $this->block->getBlockList($module, $type);

        $commonField = 'common';
-        if($module == 'project')
+        if($module == 'project' and $projectID)
        {
            $project     = $this->loadModel('project')->getByID($this->session->project);
            $commonField = $project->model . 'common';