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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mzl
2026-01-22 09:15:03 +08:00
parent 403ac7a271
commit a0d5a766a1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crm/service/StockOrdersService.php
+10 -5
View File
@@ -25,6 +25,8 @@ class StockOrdersService extends \app\common\service\StockOrdersService
// 业务id // 业务id
if (isset($p['salesperson_id']) && $p['salesperson_id']) { if (isset($p['salesperson_id']) && $p['salesperson_id']) {
$config['where']['salesperson_id'] = $p['salesperson_id']; $config['where']['salesperson_id'] = $p['salesperson_id'];
} else {
$config['where']['salesperson_id'] = $request->user->uid;
} }
// 初、终版 // 初、终版
$config['where']['is_final'] = $p['is_final'] ?? 0; $config['where']['is_final'] = $p['is_final'] ?? 0;
@@ -40,14 +42,16 @@ class StockOrdersService extends \app\common\service\StockOrdersService
$user_role_id = UserRoles::where('user_id', $request->user->uid)->pluck('role_id')->toArray(); $user_role_id = UserRoles::where('user_id', $request->user->uid)->pluck('role_id')->toArray();
//$roles_id = array_intersect([1,6], $request->user->role_ids); //$roles_id = array_intersect([1,6], $request->user->role_ids);
$roles_id = array_intersect([1,6], $user_role_id); $roles_id = array_intersect([1,5,6], $user_role_id);
if (count($roles_id) == 0){ if (count($roles_id) != 0){
// if(in_array(4, $request->user->role_ids)){ //业务主管 // if(in_array(4, $request->user->role_ids)){ //业务主管
// $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray(); // $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray();
// $report = array_merge($report, [$request->user->uid]); // $report = array_merge($report, [$request->user->uid]);
// $config['where']['salesperson_id'] = ['in',$report]; // $config['where']['salesperson_id'] = ['in',$report];
// } else // } else
if (in_array(5, $request->user->role_ids)){ //内勤
//内勤分组的人可以看到自己分组的备货单
if (in_array(5,$roles_id)){ //内勤
$userGroupMember = UserGroupMembers::where('user_id',$request->user->uid) $userGroupMember = UserGroupMembers::where('user_id',$request->user->uid)
->where('is_leader',1) ->where('is_leader',1)
->first(); ->first();
@@ -55,12 +59,13 @@ class StockOrdersService extends \app\common\service\StockOrdersService
$report = UserGroupMembers::where('group_id',$userGroupMember->group_id) $report = UserGroupMembers::where('group_id',$userGroupMember->group_id)
->pluck('user_id') ->pluck('user_id')
->toArray(); ->toArray();
$report = array_merge($report, [$request->user->uid]);
$config['where']['salesperson_id'] = ['in',$report]; $config['where']['salesperson_id'] = ['in',$report];
}else{ //内勤没有负责的组时 }else{ //内勤没有负责的组时
$config['where']['salesperson_id'] = $request->user->uid; $config['where']['salesperson_id'] = $request->user->uid;
} }
} else { } elseif (in_array(1,$roles_id)) { //超管可以看所有的
unset($config['where']['salesperson_id']);
}else{
$config['where']['salesperson_id'] = $request->user->uid; $config['where']['salesperson_id'] = $request->user->uid;
} }
} }