From d60c9502ef8dd49fea3421ee0b03032ef6d0511d Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 25 Jul 2023 16:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/FlowController.php | 50 +++++++---------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/app/adminapi/controller/FlowController.php b/app/adminapi/controller/FlowController.php
index c363b24eb..4e0fd3c53 100644
--- a/app/adminapi/controller/FlowController.php
+++ b/app/adminapi/controller/FlowController.php
@@ -39,46 +39,20 @@ class FlowController extends BaseAdminController
     public function create()
     {
         $param = get_params();
-        $param['flow_list'] = '';
-        $flow_list = [];
-        if ($param['check_type'] == 1) {
-            $flowTypeData = isset($param['flowType']) ? $param['flowType'] : '';
-            $flowUidsData = isset($param['flowUidsA']) ? $param['flowUidsA'] : '';
-            foreach ($flowTypeData as $key => $value) {
-                if (!$value) {
+        $param['copy_to'] = empty($param['copy_to']) ? [] : $param['copy_to'];
+        $param['flow_detail'] = empty($param['flow_detail']) ? [] : $param['flow_detail'];
+        if ($param['flow_detail']['type'] == 1 || $param['flow_detail']['type'] == 3) {
+            foreach ($param['flow_detail']['step'] as $key => $step) {
+                if ($param['flow_detail']['type'] == 1 && $step['type'] < 3) {
                     continue;
                 }
-                if ($value > 2 && $flowUidsData[$key] == '') {
+                if (empty($step['user'])) {
                     return $this->fail('第' . ($key + 1) . '行的指定人未选择');
                 }
-                $item = [];
-                $item['flow_type'] = $value;
-                $item['flow_uids'] = $flowUidsData[$key];
-                $flow_list[] = $item;
             }
-            $param['flow_list'] = serialize($flow_list);
-        }
-        if ($param['check_type'] == 3) {
-            $flowNameData = isset($param['flowName']) ? $param['flowName'] : '';
-            $flowUidsData = isset($param['flowUidsB']) ? $param['flowUidsB'] : '';
-            foreach ($flowNameData as $key => $value) {
-                if (!$value) {
-                    continue;
-                }
-                if ($flowUidsData[$key] == '') {
-                    return $this->fail('第' . ($key + 1) . '行的指定人未选择');
-                }
-                $item = [];
-                $item['flow_name'] = $value;
-                $item['flow_type'] = 5;
-                $item['flow_uids'] = $flowUidsData[$key];
-                $flow_list[] = $item;
-            }
-            if (empty($flow_list)) {
-                return $this->fail('审批流程信息未完善');
-            }
-            $param['flow_list'] = serialize($flow_list);
         }
+        $param['flow_detail'] = json_encode($param['flow_detail'], JSON_UNESCAPED_UNICODE);
+        $param['copy_to'] = json_encode($param['copy_to'], JSON_UNESCAPED_UNICODE);
         if ($param['id'] > 0) {
             $param['update_time'] = time();
             Db::name('Flow')->strict(false)->field(true)->update($param);
@@ -90,6 +64,14 @@ class FlowController extends BaseAdminController
         return $this->success('保存成功', [], 1, 1);
     }
 
+    public function view($id)
+    {
+        $info = Db::name('Flow')->find($id);
+        $info['copy_to'] = json_decode($info['copy_to'], true);
+        $info['flow_detail'] = json_decode($info['flow_detail'], true);
+        return $this->data($info);
+    }
+
     //禁用/启用
     public function status()
     {