[智价云] 数据隔离更新

app/Http/Controllers/Manager/Collect/Product.php

@@ -131,13 +131,14 @@ class Product extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ProductModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $ProductModel->addProduct($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);

app/Http/Controllers/Manager/Personnel/Department.php

@@ -147,13 +147,15 @@ class Department extends Controller
         // 权限判断
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $DepartmentModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
+        
         $result     =  $DepartmentModel->addDepartment($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -326,13 +326,14 @@ class Employee extends Controller
         $map = ['mobile' => $all_data['mobile']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $company_id;
         }
         $data = $EmployeeModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工手机号记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $EmployeeModel->addEmployee($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -392,13 +393,14 @@ class Employee extends Controller
         $map = ['mobile' => $all_data['mobile']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $EmployeeModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工手机号记录已存在']);
         // 更新数据表
-        $all_data['company_id'] = $company_id;
         $result =  $EmployeeModel->updateEmployee($Employee, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/Personnel/Roles.php

@@ -156,13 +156,14 @@ class Roles extends Controller
         // 权限判断
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $RolesModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $RolesModel->addRoles($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -200,8 +201,10 @@ class Roles extends Controller
         // 权限判断
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $RolesModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);

app/Http/Controllers/Manager/WashConfig/CompanyCategory.php

@@ -143,13 +143,15 @@ class CompanyCategory extends Controller
         $map = ['name' => $all_data['name']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $CompanyCategoryModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
+       
         $result     =  $CompanyCategoryModel->addCompanyCategory($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -194,13 +196,14 @@ class CompanyCategory extends Controller
         $where = ['id' => $id];
         if ($is_admin != 1 && $company_id != 0) {
             $where['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $where['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $CompanyCategory = $CompanyCategoryModel->where($where)->first();
         if (!$CompanyCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $CompanyCategory->toArray();
-        $all_data['company_id'] = $company_id;
         $result =  $CompanyCategoryModel->editCompanyCategory_content($CompanyCategory, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/WashConfig/ControlGoods.php

@@ -162,13 +162,15 @@ class ControlGoods extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ControlGoodsModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
+        
         $result     =  $ControlGoodsModel->addControlGoods($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -205,8 +207,10 @@ class ControlGoods extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ControlGoodsModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);

app/Http/Controllers/Manager/WashConfig/LowPriceGoods.php

@@ -174,13 +174,14 @@ class LowPriceGoods extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $LowPriceGoodsModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $LowPriceGoodsModel->addLowProduct($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -232,13 +233,15 @@ class LowPriceGoods extends Controller
         $where = ['id' => $id];
         if ($is_admin != 1 && $company_id != 0) {
             $where['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $where['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $LowProduct = $LowPriceGoodsModel->where($where)->first();
         if (!$LowProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $LowProduct->toarray();
-        $all_data['company_id'] = $company_id;
+       
         $result =  $LowPriceGoodsModel->editLowProduct_content($LowProduct, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/WashConfig/PlatForm.php

@@ -136,10 +136,16 @@ class PlatForm extends Controller
         $all_data['employee_ids'] = $employee_ids;
         //查询是否存在
         $map = ['name' => $all_data['name']];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
+        }
         $data = $PlatFormModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $PlatFormModel->addPlatForm($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -177,10 +183,16 @@ class PlatForm extends Controller
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
+        }
         $PlatForm = $PlatFormModel->where($where)->first();
         if (!$PlatForm) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $PlatForm->toArray();
-        $all_data['company_id'] = $company_id;
         $result =  $PlatFormModel->updatePlatForm($PlatForm, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/WashConfig/ProductCategory.php

@@ -143,13 +143,14 @@ class ProductCategory extends Controller
         $map = ['name' => $all_data['name']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ProductCategoryModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $ProductCategoryModel->addProductCategory($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -194,13 +195,14 @@ class ProductCategory extends Controller
         $where = ['id' => $id];
         if ($is_admin != 1 && $company_id != 0) {
             $where['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $where['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $ProductCategory = $ProductCategoryModel->where($where)->first();
         if (!$ProductCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $ProductCategory->toarray();
-        $all_data['company_id'] = $company_id;
         $result =  $ProductCategoryModel->editProductCategory_content($ProductCategory, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/WashConfig/ViolationProduct.php

@@ -180,13 +180,15 @@ class ViolationProduct extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ViolationProductModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
+       
         $result     =  $ViolationProductModel->addViolationProduct($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -228,8 +230,10 @@ class ViolationProduct extends Controller
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ViolationProductModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);

app/Http/Controllers/Manager/WashConfig/ViolationStore.php

@@ -195,13 +195,14 @@ class ViolationStore extends Controller
         $map = ['social_credit_code' => $all_data['social_credit_code']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
+            $all_data['company_id'] = $company_id;
         } else {
             $map['company_id'] = $admin_company_id;
+            $all_data['company_id'] = $admin_company_id;
         }
         $data = $ViolationStoreModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '营业执照记录已存在']);
         // 写入数据表
-        $all_data['company_id'] = $company_id;
         $result     =  $ViolationStoreModel->addViolationStore($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);