Merge branch release/22.0.beta of zentao/zentaopms (#13313)

db/update21.7.8.sql

@@ -162,6 +162,8 @@ UPDATE zt_activity SET optional = CASE
     ELSE optional
 END;
 
+UPDATE `zt_activity` SET `optional` = 'yes' WHERE `optional` = '';
+
 ALTER TABLE `zt_process` CHANGE `model` `model` varchar(30) NOT NULL DEFAULT '';
 
 ALTER TABLE `zt_auditplan` ADD `cycleType` varchar(10) NOT NULL DEFAULT 'noCycle' COMMENT '周期类型' AFTER `status`;

module/doc/model.php

@@ -1796,7 +1796,9 @@ class docModel extends model
         {
             $this->dao->update(TABLE_PROJECTDELIVERABLE)
                  ->set('name')->eq($doc->title)
+                 ->set('docVersion')->eq($doc->version)
                  ->where('doc')->eq($docID)
+                 ->andWhere('status')->eq('draft')
                  ->exec();
         }