Merge branch release/21.7.8 of zentao/zentaopms (#12899)

lib/dao/dao.class.php

@@ -256,6 +256,12 @@ class dao extends baseDAO
             $groupID = !empty($result->workflowGroup) ? $result->workflowGroup : 0;
         }
 
+        if($groupID)
+        {
+            $builtIn = $this->dbh->query("SELECT `main` FROM " . TABLE_WORKFLOWGROUP . " WHERE `id` = '{$groupID}'")->fetch(PDO::FETCH_OBJ);
+            $groupID = !empty($builtIn->main) ? 0 : $groupID;
+        }
+
         $flowAction = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '{$module}' AND `action` = '{$method}' AND `buildin` = '1' AND `extensionType` = 'extend' AND `vision` = '{$this->config->vision}' AND `group` = '{$groupID}'")->fetch(PDO::FETCH_OBJ);
         if(!$flowAction) return $this;
 

lib/zin/wg/docapp/js/v1.js

@@ -921,10 +921,10 @@ const actionsMap =
         if(!isApi && !isTemplate)
         {
             const canExportWord = hasPriv('exportDoc');
-            if(doc.contentType === 'doc' || doc.contentType === 'markdown')
+            if(canExportWord && (doc.contentType === 'doc' || doc.contentType === 'markdown'))
             {
                 const exportItems = [
-                    canExportWord ? {text: lang.exportWord, command: 'exportWord'} : null,
+                    {text: lang.exportWord, command: 'exportWord'},
                     config.debug > 5 ? {text: lang.exportPdf, command: 'exportDoc/pdf'} : null,
                     config.debug > 5 ? {text: lang.exportImage, command: 'exportDoc/png'} : null,
                     {text: lang.exportMarkdown, command: 'exportDoc/markdown'},