|
|
@@ -48,11 +48,19 @@ class FeedbackRepository extends BaseRepository
|
|
48
|
48
|
})->select();
|
|
49
|
49
|
|
|
50
|
50
|
foreach ($list as &$item) {
|
|
51
|
|
- $userReply = Db::name('feedback_reply')
|
|
|
51
|
+ $isReply = Db::name('feedback_reply')
|
|
52
|
52
|
->where(['feedback_id' => $item['feedback_id']])
|
|
53
|
|
- ->where(['admin_read' => 0])
|
|
|
53
|
+ ->where(['user_id', '>', 0])
|
|
54
|
54
|
->find();
|
|
55
|
|
- $item['userReply'] = $userReply ? 1 : 0;
|
|
|
55
|
+ if (!$isReply) {
|
|
|
56
|
+ $item['userReply'] = 0;
|
|
|
57
|
+ }else{
|
|
|
58
|
+ $userReply = Db::name('feedback_reply')
|
|
|
59
|
+ ->where(['feedback_id' => $item['feedback_id']])
|
|
|
60
|
+ ->where(['admin_read' => 0])
|
|
|
61
|
+ ->find();
|
|
|
62
|
+ $item['userReply'] = $userReply ? 1 : 0;
|
|
|
63
|
+ }
|
|
56
|
64
|
}
|
|
57
|
65
|
|
|
58
|
66
|
return compact('count', 'list');
|