提交

application/api/controller/Approveflow.php

@@ -28,12 +28,12 @@ class Approveflow extends Base
      * @Apidoc\Param("module", type="integer", require=true, desc="模块类型:1=申购申请,2=呈批申请,3=入库申请,4=领用申请,5=出差申请,6=请假申请,7=用车申请,8=维修申请,9=合同呈批,10=收文批阅,11=学校文件")
      * @Apidoc\Returned("approve_user", type="array", desc="审批人列表",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
-     *     @Apidoc\Returned("headimg", type="string", desc="头像"),
+     *     @Apidoc\Returned("avatar", type="string", desc="头像"),
      *     @Apidoc\Returned("name", type="string", desc="姓名"),
      * )
      * @Apidoc\Returned("copy_user", type="array", desc="抄送人列表",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
-     *     @Apidoc\Returned("headimg", type="string", desc="头像"),
+     *     @Apidoc\Returned("avatar", type="string", desc="头像"),
      *     @Apidoc\Returned("name", type="string", desc="姓名"),
      * )
      * @Apidoc\Returned("is_copy", type="integer", desc="是否允许用户自己添加抄送人 0=否,1=是")

application/api/controller/Dingtalk.php

@@ -3,21 +3,11 @@ namespace app\api\controller;
 
 use app\common\model\User;
 use app\common\service\DingtalkService;
-use think\Db;
 use hg\apidoc\annotation as Apidoc;
 
 class Dingtalk extends Base
 {
 
-    public function get_obj(){
-        $get_token_obj = new Dingtoken();
-        $access_token = $get_token_obj->main()['accessToken'];
-        require_once env('root_path').'/vendor/dingapi/TopSdk.php';
-        date_default_timezone_set('Asia/Shanghai');
-        $c = new \DingTalkClient(\DingTalkConstant::$CALL_TYPE_OAPI, \DingTalkConstant::$METHOD_POST , \DingTalkConstant::$FORMAT_JSON);
-        return array('obj'=>$c,'access_token'=>$access_token);
-    }
-
     /**
      * 获取部门列表
      *

application/common/service/ApproveFlowService.php

@@ -61,7 +61,7 @@ class ApproveFlowService
         if (!$user_ids) {
             return [];
         }
-        return User::field('userid,headimg,name')->where('userid', 'in', $user_ids)->select();
+        return User::field('userid,avatar,name')->where('userid', 'in', $user_ids)->select();
     }
 
 }

application/common/service/ApproveInfoService.php

@@ -345,13 +345,13 @@ class ApproveInfoService
                 'approve' => function ($query) {
                     $query->field('is_deleted,create_at', true)
                         ->with(['user' => function ($query) {
-                            $query->field('userid,headimg,name');
+                            $query->field('userid,avatar,name');
                         }]);
                 },
                 'approveCopy' => function ($query) {
                     $query->field('is_deleted,create_at', true)
                         ->with(['user' => function ($query) {
-                            $query->field('userid,headimg,name');
+                            $query->field('userid,avatar,name');
                         }]);
                 }
             ]);