|
|
@@ -208,23 +208,22 @@ class Base
|
|
|
foreach ($user_wechat as $k => $v) {
|
|
|
if (!isset($v['uid'])) {
|
|
|
$v['uid'] = $v['id'];
|
|
|
- }
|
|
|
- $user = Dever::db('passport/user')->one($v['uid']);
|
|
|
- if (isset($user['bind']) && $user['bind'] == 1 && $cur != $v['uid']) {
|
|
|
- $drop[$cur] = $cur;
|
|
|
- $cur = $v['uid'];
|
|
|
- } elseif (isset($user['temp']) && $user['temp'] == 2 && $cur != $v['uid']) {
|
|
|
- $drop[$cur] = $cur;
|
|
|
- $cur = $v['uid'];
|
|
|
- } elseif (isset($user['avatar']) && $user['avatar'] && $cur != $v['uid']) {
|
|
|
- $drop[$cur] = $cur;
|
|
|
- $cur = $v['uid'];
|
|
|
+ $user = $v;
|
|
|
} else {
|
|
|
- if ($v['uid'] < $cur) {
|
|
|
+ $user = Dever::db('passport/user')->one($v['uid']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($cur != $v['uid']) {
|
|
|
+ if ($user['bind'] == 1 || $user['temp'] == 2 || $user['avatar']) {
|
|
|
$drop[$cur] = $cur;
|
|
|
$cur = $v['uid'];
|
|
|
- } elseif ($v['uid'] > $cur) {
|
|
|
- $drop[$v['uid']] = $v['uid'];
|
|
|
+ } else {
|
|
|
+ if ($v['uid'] < $cur) {
|
|
|
+ $drop[$cur] = $cur;
|
|
|
+ $cur = $v['uid'];
|
|
|
+ } elseif ($v['uid'] > $cur) {
|
|
|
+ $drop[$v['uid']] = $v['uid'];
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
dever