xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_bm

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-21 17:31:23 +08:00
parent 68ff8caa41 f7349db2c4
commit 570b8060cc
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/UserService.php
+6
View File
@@ -35,6 +35,9 @@ class UserService
/** 更新 */ /** 更新 */
public function serviceUpdateUser(Request $request, array $data = []) 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); $data = $this->preProcess('Update', $data, $request);
$config = $this->buildQueryConfig($request, 'update'); $config = $this->buildQueryConfig($request, 'update');
$updated = $this->logicUpdateBy($config, $data); $updated = $this->logicUpdateBy($config, $data);
@@ -44,6 +47,9 @@ class UserService
/** 更新 */ /** 更新 */
public function serviceUpdate(Request $request, array $data = []) 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['roles']);
unset($data['corp_name']); unset($data['corp_name']);
$data = $this->preProcess('Update', $data, $request); $data = $this->preProcess('Update', $data, $request);
app/common/logic/AuthLogic.php
+14 -6
View File
@@ -87,13 +87,21 @@ class AuthLogic
try { try {
$phone = $this->sanitizePhone($feishuUserInfo['mobile'] ?? ''); $phone = $this->sanitizePhone($feishuUserInfo['mobile'] ?? '');
$email = $feishuUserInfo['enterprise_email']; $email = $feishuUserInfo['enterprise_email'];
$user = User::where('corp_id', $feishuUserInfo['corp_id']) // $user = User::where('corp_id', $feishuUserInfo['corp_id'])
->where(function($query) use ($phone, $email) { // ->where(function($query) use ($phone, $email) {
$query->where('phone', $phone) // $query->where('phone', $phone)
->orWhere('email', $email); // ->orWhere('email', $email);
}) // })
// ->first();
$userByPhone = User::where('corp_id', $feishuUserInfo['corp_id'])
->where('phone', $phone)
->where('phone', '!=', '')
->first(); ->first();
$userByEmail = User::where('corp_id', $feishuUserInfo['corp_id'])
->where('email', $email)
->where('email', '!=', '')
->first();
$user = $userByPhone ?: $userByEmail;
if (!$user) { if (!$user) {
// 获取编号 // 获取编号
$userSn = $this->getAvailableUserSn(); $userSn = $this->getAvailableUserSn();
app/crm/controller/CustomerController.php
+6 -5
View File
@@ -388,7 +388,7 @@ class CustomerController extends BaseController
public function delete(Request $request) public function delete(Request $request)
{ {
$id = Util::getParam($request, 'id'); $id = Util::getParam($request, 'id');
$force = Util::getParam($request, 'force',''); $scene = Util::getParam($request, 'scene','');
$userId = $request->user->uid; $userId = $request->user->uid;
$where = [ $where = [
@@ -401,9 +401,10 @@ class CustomerController extends BaseController
} }
try { try {
Db::beginTransaction(); Db::beginTransaction();
if ($force == 'force') { if ($scene == 'force') {
//强制删除 //status=5：业务员自己删除
$res = $customer->forceDelete(); $customer->status = 5;
$res = $customer->save();
}else{ }else{
$customer->user_id = 0; $customer->user_id = 0;
$customer->save(); $customer->save();
@@ -414,10 +415,10 @@ class CustomerController extends BaseController
'user_his' => $userId, 'user_his' => $userId,
'user_id' => 0, 'user_id' => 0,
]); ]);
}
//软删除 //软删除
$res = $customer->delete(); $res = $customer->delete();
}
Db::commit(); Db::commit();
} catch (\Throwable $e) { } catch (\Throwable $e) {
Db::rollback(); Db::rollback();