提交

application/api/controller/Approveinfo.php

@@ -109,6 +109,7 @@ class Approveinfo extends Base
     public function create()
     {
         // {"way":"create","id": "","module": "1","apply_user_id":"","reason": "测试","type": "1","desc": "","start_time": "","end_time": "","document": "","images": "","remark": "","total_amount": "1000","pay_type": "1","word_size": "","apply_id":"0","number": "","is_who": "","start_am": "","end_am": "","time": "","reach_address": "","end_address": "","scope": "","legal_opinion": "","founder": "","serial_number": "","apply_date": "","degree": "","department": "","department_sign": "","approve_user": "1925696723824730358","copy_user": "","apply_goods": [{"id": "1","goods_category_first": "1","goods_category_id": "3","goods_no": "100001","goods_name": "医疗口罩一次性","goods_brand": "一次性口罩","goods_stock": [{"id": "1","name": "均码,白色","price": "1","stock": "110"},{"id": "2","name": "均码,蓝色","price": "1","stock": "100"},{"id": "19","name": "均码,红色","price": "1","stock": "120"}]},{"id": "2","goods_category_first": "1","goods_category_id": "3","goods_no": "100002","goods_name": "84消毒液","goods_brand": "安其生","goods_stock": [{"id": "3","name": "380ml,低浓度","price": "1","stock": "110"},{"id": "4","name": "380ml,高浓度","price": "1","stock": "100"}]},{"id": "","goods_category_first": "1","goods_category_id": "3","goods_no": "100003","goods_name": "一次性手套丁腈橡胶","goods_brand": "万力","goods_stock": [{"name": "白色","price": "0.2","stock": "110"},{"name": "蓝色","price": "0.2","stock": "100"}]}],"peer_user": [{"is_who": "","user_id": "","name": "","desc": ""}]}
+        // {"way":"create","id": "","module": "3","apply_user_id":"","reason": "测试","type": "","desc": "","start_time": "","end_time": "","document": "","images": "","remark": "入库备注","total_amount": "","pay_type": "","word_size": "","apply_id":"0","number": "","is_who": "","start_am": "","end_am": "","time": "","reach_address": "","end_address": "","scope": "","legal_opinion": "","founder": "","serial_number": "","apply_date": "","degree": "","department": "","department_sign": "","approve_user": "1925696723824730358","copy_user": "","stock_goods": [{"id": "1","goods_category_first": "1","goods_category_id": "3","goods_no": "100001","goods_name": "医疗口罩一次性","goods_brand": "一次性口罩","goods_stock": [{"id": "1","name": "均码,白色","price": "1","stock": "110"},{"id": "2","name": "均码,蓝色","price": "1","stock": "100"},{"id": "19","name": "均码,红色","price": "1","stock": "120"}]},{"id": "2","goods_category_first": "1","goods_category_id": "3","goods_no": "100002","goods_name": "84消毒液","goods_brand": "安其生","goods_stock": [{"id": "3","name": "380ml,低浓度","price": "1","stock": "110"},{"id": "4","name": "380ml,高浓度","price": "1","stock": "100"}]},{"id": "","goods_category_first": "1","goods_category_id": "3","goods_no": "100003","goods_name": "一次性手套丁腈橡胶","goods_brand": "万力","goods_stock": [{"name": "白色","price": "0.2","stock": "110"},{"name": "蓝色","price": "0.2","stock": "100"}]}],"peer_user": [{"is_who": "","user_id": "","name": "","desc": ""}]}
         $way = input('way');
         $id = input('id',0);
         $module = input('module');

application/common/service/ApproveInfoService.php

@@ -587,8 +587,10 @@ class ApproveInfoService
     public static function get_detail($id, $user, $type)
     {
         $info = ApproveInfo::field('is_deleted', true)
-            ->when($user,function ($query) use ($user) {
-                $query->where('user_id', $user['userid'])->whereOr('apply_user_id', $user['userid']);
+            ->where(function ($query) use ($user) {
+                if($user){
+                    $query->where('user_id', $user['userid'])->whereOr('apply_user_id', $user['userid']);
+                }
             })
             ->where('is_deleted', CommonConstant::IS_DELETED_0);
         if ($type == 'detail') {
@@ -625,7 +627,7 @@ class ApproveInfoService
                     $create_user['create_at'] = $info['create_at'];
 
                     if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
-                        if($info['userid'] != $info['apply_user_id']){
+                        if($info['user_id'] != $info['apply_user_id']){
                             $apply_user_info = User::field('userid,name,avatar')
                                 ->where('userid', $info['apply_user_id'])
                                 ->find();
@@ -648,7 +650,7 @@ class ApproveInfoService
                     $create_user = $apply_user;
                     $create_user['create_at'] = $info['create_at'];
                     if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
-                        if($info['userid'] != $info['apply_user_id']){
+                        if($info['user_id'] != $info['apply_user_id']){
                             $apply_user_info = User::field('userid,name,avatar')
                                 ->where('userid', $info['userid'])
                                 ->find();