提交

application/common/service/DingtalkService.php

@@ -4,6 +4,7 @@ namespace app\common\service;
 
 use app\common\constant\CommonConstant;
 use app\common\model\Department;
+use app\common\model\User;
 use app\extend\Dingtalk\Sample;
 
 /**
@@ -151,24 +152,31 @@ class DingtalkService
     public static function renew()
     {
         // 更新部门
-        $department_list = Department::field('is_deleted', true)->where('is_deleted', CommonConstant::IS_DELETED_0)->select();
-        $department_object = array_column($department_list->toArray(), null, 'dept_id');
 //        $department_data = self::get_tree(1);
-
         $department_data = '[{"dept_id":438337214,"name":"BOSS","parent_id":1},{"dept_id":438145402,"name":"项目管理中心","parent_id":1},{"dept_id":501674219,"name":"技术部","parent_id":438145402},{"dept_id":500773946,"name":"项目一组","parent_id":501674219},{"dept_id":501193520,"name":"项目二组","parent_id":501674219},{"dept_id":731200005,"name":"Ui测试组","parent_id":501674219},{"dept_id":501415496,"name":"销售部","parent_id":438145402},{"dept_id":859178110,"name":"运营部","parent_id":438145402},{"dept_id":724339668,"name":"职能支持中心","parent_id":1},{"dept_id":438218445,"name":"人力资源部","parent_id":724339668},{"dept_id":702458745,"name":"财务部","parent_id":724339668}]';
         $department_data = json_decode($department_data, JSON_UNESCAPED_UNICODE);
         $department_data_object = array_column($department_data, null, 'dept_id');
+        $department_list = Department::field('is_deleted', true)
+            ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->select();
+        $department_object = array_column($department_list->toArray(), null, 'dept_id');
         $save_department_data = [];
         $add_department_data = [];
         $del_department_data = [];
+        $user_data = [];
+
         foreach ($department_data as $value) {
             if (array_key_exists($value['dept_id'], $department_object)) {
                 $save_department_data[] = $value;
             } else {
                 $add_department_data[] = $value;
             }
-        }
 
+            $user_data[] = self::user_list($value['dept_id']);
+        }
+        p($user_data);
+        p(json_encode($user_data,JSON_UNESCAPED_UNICODE));
+        exit;
         if ($save_department_data) {
             foreach ($department_list as $val) {
                 if (array_key_exists($val['dept_id'], $department_data_object)) {
@@ -179,16 +187,19 @@ class DingtalkService
                 }
             }
         }
-
         if ($add_department_data) {
             Department::insertAll($add_department_data);
         }
-
         if ($del_department_data) {
             Department::where('id', 'in', $del_department_data)->delete();
         }
 
         // 更新员工
+        $user_list = User::field('is_deleted', true)
+            ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->select();
+        $user_object = array_column($user_list->toArray(), null, 'userid');
+
     }
 
     /**