From 59151cf04eb8fa128d56743bd1f55bae6244cd1c Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 21 Aug 2025 11:07:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E8=87=AA?= =?UTF-8?q?=E8=A1=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/controller/CustomerController.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index 3d03c9e..ab72713 100644 --- a/app/crm/controller/CustomerController.php +++ b/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, 'force',''); $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(); From 60dcc3399f7beec425191a01a427a8e91feabce9 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 21 Aug 2025 14:02:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/UserService.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 3354e88..6675a89 100644 --- a/app/admin/service/UserService.php +++ b/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); From fad96708eab6437df1a5853226d5473e6ac41a0a Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 21 Aug 2025 14:11:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/controller/CustomerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index ab72713..e51b83f 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -388,7 +388,7 @@ class CustomerController extends BaseController public function delete(Request $request) { $id = Util::getParam($request, 'id'); - $scene = Util::getParam($request, 'force',''); + $scene = Util::getParam($request, 'scene',''); $userId = $request->user->uid; $where = [ From d41fc55e617d1486748f03d76649ebaab16fdd29 Mon Sep 17 00:00:00 2001 From: mzl Date: Thu, 21 Aug 2025 14:31:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=B0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=9C=A8=E6=B2=A1=E6=9C=89=E4=BC=81=E4=B8=9A=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/AuthLogic.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/common/logic/AuthLogic.php b/app/common/logic/AuthLogic.php index 9857df8..c79b1d1 100644 --- a/app/common/logic/AuthLogic.php +++ b/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();