提交

application/api/controller/Approveinfo.php

@@ -165,7 +165,7 @@ class Approveinfo extends Base
      * @Apidoc\Method("POST")
      * @Apidoc\Param("page", type="integer",require=true, desc="页数")
      * @Apidoc\Param("page_num", type="integer", require=true, desc="每页数量")
-     * @Apidoc\Param("group", type="integer", require=true, desc="类别:list=我的申请记录,form=采购审批单")
+     * @Apidoc\Param("group", type="integer", require=true, desc="类别:list=我的申请记录,form=采购审批单 默认list")
      * @Apidoc\Param("module", type="integer", require=false, desc="模块类型:1=申购申请,2=呈批申请,3=入库申请,4=领用申请,5=出差申请,6=请假申请,7=用车申请,8=维修申请,9=合同呈批,10=收文批阅,11=学校文件")
      * @Apidoc\Param("status", type="integer", require=false, desc="审批状态:2=审批中,3=审批通过,4=审批驳回,5=审批撤销")
      * @Apidoc\Param("search", type="string", require=false, desc="搜索 事由 编号")

application/common/service/ApproveInfoService.php

@@ -741,7 +741,7 @@ class ApproveInfoService
      *
      * @param integer $id 申请ID
      * @param mixed $user 用户信息
-     * @param string $group 类别:0=审批人/后台,1=提交人 审批详情,我的申请详情/信息
+     * @param string $group 类别:0=审批人/后台,1=提交人申请人 审批详情,我的申请详情/信息
      * @param string $type 类型:detail=详情,info=信息
      **/
     public static function get_detail($id, $user, $group, $type)
@@ -778,25 +778,42 @@ class ApproveInfoService
             if ($info) {
                 $module = $info['module'];
                 if ($group == CommonConstant::IS_WHO_1) {
-                    // 提交人
-                    $apply_user = [
+                    // 先默认当前是提交人
+                    $create_user = [
                         'id' => $user['id'],
                         'userid' => $user['userid'],
                         'name' => $user['name'],
                         'avatar' => $user['avatar'],
                     ];
-                    $create_user = $apply_user;
+                    $apply_user = $create_user;
                     if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
-                        if ($info['user_id'] != $info['apply_user_id']) {
-                            $apply_user_info = User::field('id,userid,name,avatar')
-                                ->where('userid', $info['apply_user_id'])
-                                ->find();
-                            $apply_user = [
-                                'id' => $apply_user_info['id'],
-                                'userid' => $apply_user_info['userid'],
-                                'name' => $apply_user_info['name'],
-                                'avatar' => $apply_user_info['avatar'],
-                            ];
+                        if($user['userid'] == $info['user_id']){
+                            // 当前是提交人
+                            if ($info['user_id'] != $info['apply_user_id']) {
+                                $apply_user_info = User::field('id,userid,name,avatar')
+                                    ->where('userid', $info['apply_user_id'])
+                                    ->find();
+                                $apply_user = [
+                                    'id' => $apply_user_info['id'],
+                                    'userid' => $apply_user_info['userid'],
+                                    'name' => $apply_user_info['name'],
+                                    'avatar' => $apply_user_info['avatar'],
+                                ];
+                            }
+                        }
+                        if($user['userid'] == $info['apply_user_id']){
+                            //  当前是申请人
+                            if ($info['user_id'] != $info['apply_user_id']) {
+                                $apply_user_info = User::field('id,userid,name,avatar')
+                                    ->where('userid', $info['user_id'])
+                                    ->find();
+                                $create_user = [
+                                    'id' => $apply_user_info['id'],
+                                    'userid' => $apply_user_info['userid'],
+                                    'name' => $apply_user_info['name'],
+                                    'avatar' => $apply_user_info['avatar'],
+                                ];
+                            }
                         }
                     }
                 }
@@ -805,13 +822,13 @@ class ApproveInfoService
                     $apply_user = User::field('id,userid,name,avatar')
                         ->where('userid', $info['apply_user_id'])
                         ->find();
-                    $apply_user = [
+                    $create_user = [
                         'id' => $apply_user['id'],
                         'userid' => $apply_user['userid'],
                         'name' => $apply_user['name'],
                         'avatar' => $apply_user['avatar'],
                     ];
-                    $create_user = $apply_user;
+                    $apply_user = $create_user;
                     if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
 
                         if ($info['user_id'] != $info['apply_user_id']) {

application/common/service/ApproveService.php

@@ -38,7 +38,7 @@ class ApproveService
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->where('approve_user', $userid)
             ->column('info_id');
-        $object = [];
+        $key = [];
         if ($ids) {
             $list = ApproveInfo::field('module,count(id) as number')
                 ->where('id', 'in', $ids)
@@ -48,15 +48,15 @@ class ApproveService
                 ->group('module')
                 ->select()
                 ->toArray();
-            $object = $list ? array_column($list, null, 'module') : [];
+            $key = $list ? array_column($list, null, 'module') : [];
         }
 
         $data = [];
         foreach ($get_module_list as $module => $value) {
             $module_text = $value;
             $number = 0;
-            if (array_key_exists($module, $object)) {
-                $number = $object[$module]['number'];
+            if (array_key_exists($module, $key)) {
+                $number = $key[$module]['number'];
             }
 
             $params = compact('module', "module_text", 'number');
@@ -107,7 +107,7 @@ class ApproveService
             ->field($field)
             ->when($status, function ($query) use ($aliasName, $status) {
                 if ($status == 1) {
-                    $query->where($aliasName . 'status', CommonConstant::STATUS_1);
+                    $query->where($aliasName . 'status', CommonConstant::STATUS_2);
 //                    $query->where($aliasName . 'status', 'in', [CommonConstant::STATUS_1, CommonConstant::STATUS_2]);
                 }
                 if ($status == 2) {