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

Merge branch dev/bug-63616 of zentao/zentaopms (#9971)

Browse Source
This commit is contained in:
刘刚
2025-06-26 14:53:17 +08:00
committed by Gitfox
parent 02dee78d3f 1c600f7f9e
commit f22f5ecdb1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -2
View File
@@ -2574,8 +2574,7 @@ class actionModel extends model
$projectCondition = isset($grantedProjects) ? "(execution = '0' AND project != '0' AND project " . helper::dbIN($grantedProjects) . ')' : "(execution = '0' AND project = '{$projectID}')";
$executionCondition = isset($grantedExecutions) ? "(execution != '0' AND execution " . helper::dbIN($grantedExecutions) . ')' : "(execution != '0' AND execution = '{$executionID}')";
$condition = "((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') {$productCondition} OR {$projectCondition} OR {$executionCondition}";
return $condition;
return "((action.product =',0,' OR action.product = '0' OR action.product=',,') AND project = '0' AND execution = '0') {$productCondition} OR {$projectCondition} OR {$executionCondition}";
}
/**