|
|
@@ -232,7 +232,7 @@ class LowPriceGoods extends Controller
|
|
|
* @version 1.0
|
|
|
* @date 2025-06-17
|
|
|
*/
|
|
|
- public function export_excel(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
|
|
|
+ public function export_excel(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, EmployeeModel $EmployeeModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
|
|
|
{
|
|
|
$request->scene('export_excel')->validate();
|
|
|
$message_data['admin_company_id'] = request('admin_company_id', '0');
|
|
|
@@ -414,6 +414,13 @@ class LowPriceGoods extends Controller
|
|
|
$shipment_city_ids = explode(',', $shipment_city_ids);
|
|
|
$LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_city_id', $shipment_city_ids);
|
|
|
}
|
|
|
+ $personnel_roles_info = $EmployeeModel->leftjoin('personnel_roles', 'personnel_roles.id', '=', 'personnel_employee.role_id')
|
|
|
+ ->where('personnel_employee.id', $user_id)->select(['personnel_employee.id', 'personnel_roles.identity'])
|
|
|
+ ->first();
|
|
|
+ //角色身份1=普通2=管理员
|
|
|
+ if(!empty($personnel_roles_info) && $personnel_roles_info->identity == 2){
|
|
|
+ $is_admin = 1;
|
|
|
+ }
|
|
|
$result_count = 0;
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$result_count = $LowPriceGoodsModel->where(function ($q) use ($user_id) {
|