用户修改为管理或客服，黑名单清空

app/enterprise/model/Friend.php

@@ -47,4 +47,19 @@ class Friend extends BaseModel
             'avatar' => $avatar
         ];
     }
+
+    // 同步更新取消黑名单
+    public static function syncCancelBlacklist($uid)
+    {
+        $where = [
+            'create_user' => $uid,
+            'is_blacklist' => 1,
+            'delete_time' => 0,
+            'status' => 1
+        ];
+        $friend_ids = self::where($where)->column('friend_id');
+        if ($friend_ids) {
+            self::where('id', 'in', $friend_ids)->update(['is_blacklist' => 0]);
+        }
+    }
 }

app/manage/controller/Config.php

@@ -10,6 +10,7 @@ namespace app\manage\controller;
 
 
 use app\BaseController;
+use app\enterprise\model\Friend;
 use app\manage\model\{Config as Conf};
 use think\facade\Cache;
 class Config extends BaseController
@@ -72,6 +73,15 @@ class Config extends BaseController
             $systemInfo=Conf::getSystemInfo(true);
             // 向所有人推送新的设置
             wsSendMsg(0,'updateConfig',$systemInfo);
+            if ($name == 'chatInfo') {
+                $status = $value['autoAddUser']['status'] ?? 0;
+                $user_ids = $value['autoAddUser']['user_ids'] ?? [];
+                if ($status == 0 && $user_ids) {
+                    foreach ($user_ids as $uid) {
+                        Friend::syncCancelBlacklist($uid);
+                    }
+                }
+            }
         }
         return success(lang('system.editOk'));
     }

app/manage/controller/User.php

@@ -189,6 +189,9 @@ class User extends BaseController
         try{
             $role = $this->request->param('role');
             UserModel::where('user_id', $user_id)->update(['role'=>$role]);
+            if ($role > 0) {
+                Friend::syncCancelBlacklist($user_id);
+            }
             return success(lang('system.settingOk'));
         }catch (\Exception $e){
             return error('');