供销

app/Model/UseScopeBaseModel.php

@@ -33,7 +33,6 @@ class UseScopeBaseModel extends Model
 
     //最高权限
     private function makeModel(&$query, $auth_type, $user, $depart_range, $column){
-        $auth_type = 2;$depart_range= [2];
         if(empty($column)) return;
 
         if($auth_type == Employee::AUTH_ONE){

app/Service/OrganizationService.php

@@ -243,7 +243,7 @@ class OrganizationService extends Service
     public function organizationRule(&$data, $user, $is_add = true){
         if(empty($data['code'])) return [false, '编码不能为空'];
         if(empty($data['title'])) return [false, '名称不能为空'];
-        if(! empty($data['type']) && ! isset(Organization::$type_name[$data['type']])) return [false, '组织类型错误'];
+        if(empty($data['type']) || ! isset(Organization::$type_name[$data['type']])) return [false, '组织类型错误'];
         if(! empty($data['founding_time'])) $data['founding_time'] = $this->changeDateToDate($data['founding_time']);
 
         if(! empty($data['unit_list'])){