1

app/Http/Controllers/Api/LoginController.php

@@ -20,6 +20,6 @@ class LoginController extends BaseController
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
 
-        return $this->json_return(200,'', ['token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main']]);
+        return $this->json_return(200,'', ['token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main'],'top_depart_title'=>$return['top_depart_title']]);
     }
 }

app/Service/CustomerService.php

@@ -22,7 +22,7 @@ class CustomerService extends Service
      * @return array
      */
     public function customerEdit($data,$user){
-        list($status,$msg) = $this->customerRule($data,false);
+        list($status,$msg) = $this->customerRule($data,$user, false);
         if(!$status) return [$status,$msg];
 
         try {
@@ -179,7 +179,7 @@ class CustomerService extends Service
      * @return array
      */
     public function customerAdd($data,$user){
-        list($status,$msg) = $this->customerRule($data);
+        list($status,$msg) = $this->customerRule($data,$user);
         if(!$status) return [$status,$msg];
 
         try {
@@ -551,11 +551,13 @@ class CustomerService extends Service
      * @param $is_add
      * @return array
      */
-    public function customerRule(&$data, $is_add = true){
+    public function customerRule(&$data, $user, $is_add = true){
         if(empty($data['model_type'])) return [false,'客户模板类型不能为空'];
         if(! in_array($data['model_type'],Customer::$model_type)) return [false,'客户模板类型错误'];
         if(empty($data['title'])) return [false,'客户名称不能为空'];
-        if(! empty($data['depart_id'])) $data['top_depart_id'] = $user['depart_map'][$data['depart_id']] ?? 0;
+        //所属部门 以及  顶级部门
+        if(empty($data['depart_id'])) $data['depart_id'] = $this->getDepart($user);
+        $data['top_depart_id'] = $user['depart_map'][$data['depart_id']] ?? 0;
         if($data['model_type'] == Customer::Model_type_one){
             if(empty($data['customer_from'])) return [false,'客户来源不能为空'];
             if(empty($data['customer_type'])) return [false,'客户类别不能为空'];

app/Service/EmployeeService.php

@@ -965,7 +965,10 @@ class EmployeeService extends Service
         if($res['state'] == Employee::NOT_USE) return [false,'账号停用！'];
 
         $is_main = EmployeeService::isMain($res['id']);
-        return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'is_main' => $is_main]];
+        $return = EmployeeService::getLoginDepart($res['id']);
+        $depart_top_title = $return[1] ?? [];
+        $depart_top_title = $depart_top_title[0]['title'] ?? "";
+        return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'is_main' => $is_main, 'top_depart_title' => $depart_top_title]];
     }
 
     /**
@@ -1118,7 +1121,7 @@ class EmployeeService extends Service
             ->join('depart as b','b.id','a.depart_id')
             ->where('a.employee_id',$employee_id)
             ->where('b.is_use',Depart::IS_UES)
-            ->select('a.depart_id','b.is_main','b.parent_id','b.basic_type_id')
+            ->select('a.depart_id','b.is_main','b.parent_id','b.basic_type_id','b.title')
             ->orderBy('b.parent_id','asc')
             ->orderBy('b.is_main','desc')
             ->orderBy('a.depart_id','asc')
@@ -1135,6 +1138,7 @@ class EmployeeService extends Service
                         'depart_id' => $value['depart_id'],
                         'is_main' => $value['is_main'],
                         'basic_type_id' => $value['basic_type_id'],
+                        'title' => $value['title'],
                     ];
                     $map[$value['depart_id']] = $value['depart_id'];
                     if(! empty($tmp['is_main']) && ! $is_all_depart) $is_all_depart = 1;
@@ -1146,6 +1150,7 @@ class EmployeeService extends Service
                             'depart_id' => $t_tmp['id'],
                             'is_main' => $t_tmp['is_main'],
                             'basic_type_id' => $t_tmp['basic_type_id'],
+                            'title' => $t_tmp['title'],
                         ];
                         $map[$value['depart_id']] = $t;
                         if(! empty($tmp['is_main']) && $value['is_main'] &&! $is_all_depart) $is_all_depart = 1;
@@ -1201,6 +1206,8 @@ class EmployeeService extends Service
             ->where('a.employee_id',$employee_id)
             ->where('b.is_use',Depart::IS_UES)
             ->select('a.depart_id','b.is_main','b.parent_id')
+            ->orderBy('b.parent_id','asc')
+            ->orderBy('b.is_main','desc')
             ->orderBy('a.depart_id','asc')
             ->get()->toArray();
 

app/Service/Service.php

@@ -350,7 +350,6 @@ class Service
 
     public function getDepart($user){
         if(empty($user)) return 0;
-        if($user['id'] == Employee::SPECIAL_ADMIN) return 0;
         $depart = array_shift($user['rule_depart']);
         return $depart['depart_id'];
     }