提交

application/api/controller/Approveinfo.php

@@ -397,7 +397,6 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
      *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      *     @Apidoc\Returned("avatar", type="string", desc="头像地址"),
-     *     @Apidoc\Returned("approve_time", type="string", desc="日期"),
      * )
      * @Apidoc\Returned("apply_user", type="object", desc="申请人信息",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
@@ -464,7 +463,6 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
      *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      *     @Apidoc\Returned("avatar", type="string", desc="头像地址"),
-     *     @Apidoc\Returned("approve_time", type="string", desc="日期"),
      * )
      * @Apidoc\Returned("apply_user", type="object", desc="申请人信息",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),

application/common/service/DingtalkService.php

@@ -3,6 +3,7 @@
 namespace app\common\service;
 
 use app\common\constant\CommonConstant;
+use app\common\model\Department;
 use app\extend\Dingtalk\Sample;
 
 /**
@@ -146,10 +147,18 @@ class DingtalkService
      * 更新员工和部门
      **/
     public static function renew(){
-//        $department_list = UserService::get_department_column();
-
+//        $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');
+//        p($department_list);exit;
         $department_data = self::get_tree(1);
-        p($department_data);
+
+//        foreach ($department_data as $key=>$value){
+//            if(array_key_exists($value['dept_id'],$department_object)){
+//                $department = $department_object[$value['dept_id']];
+//                $department->save($value);
+//            }
+//        }
+        p(json_encode($department_data,JSON_UNESCAPED_UNICODE));
         exit;
     }