Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix workflow issue.

Browse Source
This commit is contained in:
mayue
2022-08-19 08:52:37 +08:00
parent 93b0c0efee
commit a3e8222009
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dao/dao.class.php
+8 -8
View File
@@ -29,7 +29,7 @@ class dao extends baseDAO
/**
* 设置需要更新或插入的数据。
* Set the data to update or insert.
*
*
* @param object $data the data object or array
* @access public
* @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
/**
* Check workFlow field rule.
*
*
* @access public
* @return object the dao object self.
*/
@@ -195,10 +195,10 @@ class dao extends baseDAO
$module = $app->getModuleName();
$method = $app->getMethodName();
$flowAction = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '{$module}' AND `action` = '{$method}' AND `buildin` = '1' AND `extensionType` = 'extend'")->fetch(PDO::FETCH_OBJ);
$flowAction = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '{$module}' AND `action` = '{$method}' AND `buildin` = '1' AND `extensionType` = 'extend' AND `vision` = {$config->vision}")->fetch(PDO::FETCH_OBJ);
if(!$flowAction) return $this;
$flowFields = $this->dbh->query("SELECT t2.name,t2.rules,t2.control,t2.field,t1.layoutRules FROM " . TABLE_WORKFLOWLAYOUT . " AS t1 LEFT JOIN " . TABLE_WORKFLOWFIELD . " AS t2 ON t1.module = t2.module AND t1.field = t2.field WHERE t1.module = '{$module}' AND t1.action = '{$method}' AND t1.readonly = '0'")->fetchAll();
$flowFields = $this->dbh->query("SELECT t2.name,t2.rules,t2.control,t2.field,t1.layoutRules FROM " . TABLE_WORKFLOWLAYOUT . " AS t1 LEFT JOIN " . TABLE_WORKFLOWFIELD . " AS t2 ON t1.module = t2.module AND t1.field = t2.field WHERE t1.module = '{$module}' AND t1.action = '{$method}' AND t1.readonly = '0' AND t1.vision = {$config->vision}")->fetchAll();
if(!$flowFields) return $this;
$rules = array();
@@ -232,10 +232,10 @@ class dao extends baseDAO
}
/**
* 检查工作流扩展字段
* check workflow extend field
*
* @param array $fields
* 检查工作流扩展字段
* check workflow extend field
*
* @param array $fields
* @access public
* @return object the dao object self
*/