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

* fix bug #32095.

Browse Source
This commit is contained in:
wangyidong
2023-03-17 15:57:51 +08:00
parent e3c0cafc26
commit d3149400b0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/model.php
+2 -1
View File
@@ -857,8 +857,9 @@ class myModel extends model
->where($myStoryQuery)
->andWhere('t1.type')->eq('story')
->andWhere('t1.assignedTo',1)->eq($this->app->user->account)
->orWhere('t5.reviewer')->eq($this->app->user->account)
->orWhere("(t5.reviewer = '{$this->app->user->account}' and t1.status in('reviewing','changing'))")
->markRight(1)
->andWhere('t1.product')->ne('0')
->andWhere('t1.deleted')->eq(0)
->orderBy($orderBy)
->page($pager, 't1.id')
module/my/view/story.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</div>
</div>
<div id="mainContent">
<div class="cell<?php if($type == 'bysearch') echo ' show';?>" id="queryBox" data-module=<?php echo ($app->rawMethod == 'contribute' ? 'contributeStory' : 'workStory');?>></div>
<div class="cell<?php if($type == 'bysearch') echo ' show';?>" id="queryBox" data-module=<?php echo ($app->rawMethod == 'contribute' ? 'contributeStory' : 'workStory');?>></div>
<?php if(!$stories):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo sprintf($lang->my->noData, $lang->SRCommon);?></span></p>