Merge branch 'develop' into develop_bm

app/admin/service/UserService.php

@@ -35,6 +35,9 @@ class UserService
     /** 更新 */
     public function serviceUpdateUser(Request $request, array $data = [])
     {
+        if(isset($data['report_to']) && empty($data['report_to'])){
+            $data['report_to'] = 0;
+        }
         $data = $this->preProcess('Update', $data, $request);
         $config = $this->buildQueryConfig($request, 'update');
         $updated = $this->logicUpdateBy($config, $data);
@@ -44,6 +47,9 @@ class UserService
     /** 更新 */
     public function serviceUpdate(Request $request, array $data = [])
     {
+        if(isset($data['report_to']) && empty($data['report_to'])){
+            $data['report_to'] = 0;
+        }
         unset($data['roles']);
         unset($data['corp_name']);
         $data = $this->preProcess('Update', $data, $request);

app/common/logic/AuthLogic.php

@@ -87,13 +87,21 @@ class AuthLogic
         try {
             $phone = $this->sanitizePhone($feishuUserInfo['mobile'] ?? '');
             $email = $feishuUserInfo['enterprise_email'];
-            $user = User::where('corp_id', $feishuUserInfo['corp_id'])
-                        ->where(function($query) use ($phone, $email) {
-                            $query->where('phone', $phone)
-                                ->orWhere('email', $email);
-                        })
-                        ->first();
-            
+            // $user = User::where('corp_id', $feishuUserInfo['corp_id'])
+            //             ->where(function($query) use ($phone, $email) {
+            //                 $query->where('phone', $phone)
+            //                     ->orWhere('email', $email);
+            //             })
+            //             ->first();
+            $userByPhone = User::where('corp_id', $feishuUserInfo['corp_id'])
+                            ->where('phone', $phone)
+                            ->where('phone', '!=', '')
+                            ->first();
+            $userByEmail = User::where('corp_id', $feishuUserInfo['corp_id'])
+                            ->where('email', $email)
+                            ->where('email', '!=', '')
+                            ->first();
+            $user = $userByPhone ?: $userByEmail;
             if (!$user) {
                 // 获取编号
                 $userSn = $this->getAvailableUserSn();

app/crm/controller/CustomerController.php

@@ -388,7 +388,7 @@ class CustomerController extends BaseController
     public function delete(Request $request)
     {
         $id = Util::getParam($request, 'id');
-        $force = Util::getParam($request, 'force','');
+        $scene = Util::getParam($request, 'scene','');
 
         $userId = $request->user->uid;
         $where = [
@@ -401,10 +401,11 @@ class CustomerController extends BaseController
         }
         try {
             Db::beginTransaction();
-            if ($force == 'force') {
-                //强制删除
-                $res = $customer->forceDelete();
-            } else {
+            if ($scene == 'force') {
+                //status=5：业务员自己删除
+                $customer->status = 5;
+                $res = $customer->save();
+            }else{
                 $customer->user_id = 0;
                 $customer->save();
 
@@ -414,10 +415,10 @@ class CustomerController extends BaseController
                     'user_his' => $userId,
                     'user_id' => 0,
                 ]);
-
-                //软删除
-                $res = $customer->delete();
             }
+
+            //软删除
+            $res = $customer->delete();
             Db::commit();
         } catch (\Throwable $e) {
             Db::rollback();