|
@@ -28,11 +28,11 @@ class ProjectAssociation extends Model |
|
@@ -28,11 +28,11 @@ class ProjectAssociation extends Model |
|
28
|
# AICC朋友昵称
|
28
|
# AICC朋友昵称
|
|
29
|
$isRes->nickname = $data['nickname'] ?? 0;
|
29
|
$isRes->nickname = $data['nickname'] ?? 0;
|
|
30
|
# AICC用户ID
|
30
|
# AICC用户ID
|
|
31
|
- $isRes->user_id = $data['user_id'] ?? 0;
|
31
|
+ $isRes->user_id = $data['user_id'] ?? 0;
|
|
32
|
# AICC用户姓名
|
32
|
# AICC用户姓名
|
|
33
|
$isRes->user_name = $data['user_name'] ?? '';
|
33
|
$isRes->user_name = $data['user_name'] ?? '';
|
|
34
|
# AICC朋友头像
|
34
|
# AICC朋友头像
|
|
35
|
- $isRes->image = $data['image'] ?? '';
|
35
|
+ $isRes->image = $data['image'] ?? '';
|
|
36
|
return $isRes->save();
|
36
|
return $isRes->save();
|
|
37
|
}
|
37
|
}
|
|
38
|
|
38
|
|
|
@@ -55,9 +55,9 @@ class ProjectAssociation extends Model |
|
@@ -55,9 +55,9 @@ class ProjectAssociation extends Model |
|
55
|
{
|
55
|
{
|
|
56
|
$status = 1; # 1 - 正常, 0 - 禁用
|
56
|
$status = 1; # 1 - 正常, 0 - 禁用
|
|
57
|
$lists = self::query()->where('status', $status)
|
57
|
$lists = self::query()->where('status', $status)
|
|
58
|
- ->whereNotNull('project_id')
|
|
|
|
59
|
- ->whereNotNull('friend_id')
|
|
|
|
60
|
- ->whereNotNull('user_id')
|
58
|
+ ->where('project_id', '!=', 0)
|
|
|
|
59
|
+ ->where('friend_id', '!=', 0)
|
|
|
|
60
|
+ ->where('user_id', '!=', 0)
|
|
61
|
->paginate($perPage, ['project_id', 'friend_id', 'user_id'], 'page', $page);
|
61
|
->paginate($perPage, ['project_id', 'friend_id', 'user_id'], 'page', $page);
|
|
62
|
$items = $lists->Items();
|
62
|
$items = $lists->Items();
|
|
63
|
$totalPage = $lists->lastPage();
|
63
|
$totalPage = $lists->lastPage();
|