|
@@ -1263,10 +1263,14 @@ if (!function_exists('get_group_share_uid')) {
|
|
|
$share = Db::name('data_share')
|
|
|
->field('id,type,source_uid,source_data_group_id')
|
|
|
->where([
|
|
|
- 'is_del' => DataGroupModel::$delete_正常,
|
|
|
- 'status' => DataGroupModel::$status_启用,
|
|
|
- 'data_group_id' => $s['source_data_group_id'],
|
|
|
- ])->order('uid')->column('uid');
|
|
|
+ 'is_del' => DataShareModel::$delete_正常,
|
|
|
+ 'status' => DataShareModel::$status_启用,
|
|
|
+ ])
|
|
|
+ ->whereFindInSet('menu_ids', $menu_id)
|
|
|
+ ->where(function ($query) use ($uid, $group) {
|
|
|
+ return $query->where('uid', $uid)->whereOr('data_group_id', 'in', array_keys($group));
|
|
|
+ })
|
|
|
+ ->cursor();
|
|
|
|
|
|
foreach ($share as $s) {
|
|
|
$source_group_uid = Db::name('data_group_userid')
|