提交

application/common/service/ApproveInfoService.php

@@ -634,6 +634,7 @@ class ApproveInfoService
                 'moduleInfo',
                 'approve' => function ($query) {
                     $query->field('is_deleted,create_at', true)
+                        ->where('state', 'in',[CommonConstant::IS_WHO_0,CommonConstant::IS_WHO_1])
                         ->with([
                             'user' => function ($query) {
                                 $query->field('userid,name,avatar');
@@ -651,6 +652,7 @@ class ApproveInfoService
             ]);
             $info = $info->find($id);
             if ($info) {
+                //
                 $module = $info['module'];
                 // 审批提交人申请人信息
                 if ($user) {
@@ -737,6 +739,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -762,6 +766,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -779,6 +785,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -805,6 +813,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -831,6 +841,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -861,6 +873,8 @@ class ApproveInfoService
                         'approveOne' => function ($query) use ($status, $field) {
                             $query->field($field)
                                 ->where('status', $status)
+                                ->where('group', CommonConstant::IS_WHO_0)
+                                ->where('state', CommonConstant::IS_WHO_0)
                                 ->with([
                                     'user' => function ($query) {
                                         $query->field('userid,name');
@@ -886,6 +900,7 @@ class ApproveInfoService
             $module = $info['module'];
             switch ($module) {
                 case CommonConstant::MODULE_1:
+                    $info['apply_goods'] = [];
                     if ($info['type'] == ApplyConstant::TYPE_1) {
                         if ($type == 'detail') {
                             $info['apply_goods'] = $info->applyGoods()->field('id,info_id,goods_name,total_price,goods_stock')->select();

application/common/service/ApproveService.php

@@ -105,6 +105,8 @@ class ApproveService
                 }
             })
             ->where($aliasName . 'is_deleted', CommonConstant::IS_DELETED_0)
+            ->where($aliasName . 'group', CommonConstant::IS_WHO_0)
+            ->where($aliasName . 'state', CommonConstant::IS_WHO_0)
             ->where($aliasName . 'approve_user', $userid)
             ->where($jobName . 'is_deleted', CommonConstant::IS_DELETED_0)
             ->when($module, function ($query) use ($jobName, $module) {
@@ -135,6 +137,8 @@ class ApproveService
                 'approveOne' => function ($query) {
                     $query->field('id,info_id,status,approve_user')
                         ->where('status', CommonConstant::STATUS_2)
+                        ->where('group', CommonConstant::IS_WHO_0)
+                        ->where('state', CommonConstant::IS_WHO_0)
                         ->with([
                             'user' => function ($query) {
                                 $query->field('userid,name');
@@ -288,8 +292,10 @@ class ApproveService
     {
         $userid = $user['userid'];
         $info = Approve::field('id,info_id,status')
-            ->where('approve_user', $userid)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->where('group', CommonConstant::IS_WHO_0)
+            ->where('state', CommonConstant::IS_WHO_0)
+            ->where('approve_user', $userid)
             ->find($id);
         $data = [];
         if ($info) {
@@ -312,8 +318,10 @@ class ApproveService
     {
         $userid = $user['userid'];
         $approve = Approve::field('id,info_id,status,approve_flow,approve_user,approve_time')
-            ->where('approve_user', $userid)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->where('group', CommonConstant::IS_WHO_0)
+            ->where('state', CommonConstant::IS_WHO_0)
+            ->where('approve_user', $userid)
             ->with([
                 'approveInfo' => function ($query) {
                     $query->field('is_deleted', true);