1

app/Service/EmployeeService.php

@@ -488,8 +488,8 @@ class EmployeeService extends Service
      * @param $data
      * @return array
      */
-    public function departEdit($data){
-        list($status,$msg) = $this->departRule($data,false);
+    public function departEdit($data, $user){
+        list($status,$msg) = $this->departRule($data,$user,false);
         if(!$status) return [$status,$msg];
 
         $update = $msg['data'][0];
@@ -507,7 +507,7 @@ class EmployeeService extends Service
      * @return array
      */
     public function departAdd($data,$user){
-        list($status,$msg) = $this->departRule($data);
+        list($status,$msg) = $this->departRule($data,$user);
         if(!$status) return [$status,$msg];
 
         try {
@@ -677,7 +677,7 @@ class EmployeeService extends Service
      * @param $is_check
      * @return array
      */
-    public function departRule($data, $is_check = true){
+    public function departRule($data,$user, $is_check = true){
         if($this->isEmpty($data,'data')) return [false,'数据不能为空！'];
 
         $code = array_column($data['data'],'code');
@@ -701,6 +701,7 @@ class EmployeeService extends Service
 
         $count = 0;
         foreach ($data['data'] as $value){
+            if(empty($user['is_all_depart']) && empty($value['parent_id'])) return [false,'上级部门必须选择'];
             if(empty($value['parent_id']) && ! empty($value['is_main'])) $count ++;
         }
         if($count > 1) return [false,'顶级总社只允许存在一个！'];
@@ -1214,7 +1215,7 @@ class EmployeeService extends Service
                             'title' => $t_tmp['title'],
                         ];
                         $map[$value['depart_id']] = $t;
-                        if(! empty($tmp['is_main']) && $value['is_main'] &&! $is_all_depart) $is_all_depart = 1;
+                        if(! empty($tmp['is_main']) && $value['is_main'] && ! $is_all_depart) $is_all_depart = 1;
                     }
                 }
             }