修改流程管理的bug

admin/src/router/routers.ts

@@ -3,7 +3,7 @@ import Default from '@/layout/index.vue'
 import Decorate from '@/layout/decorate/index.vue'
 
 // 导入模块路由
-import approvalRoutes from './modules/approval'
+// import approvalRoutes from './modules/approval'
 
 // 静态路由
 export const STATIC_ROUTES: Array<RouteRecordRaw> = [
@@ -11,7 +11,7 @@ export const STATIC_ROUTES: Array<RouteRecordRaw> = [
     path: '/:pathMatch(.*)*',
     component: () => import('@/app/views/error/404.vue'),
   },
-  ...approvalRoutes
+  // ...approvalRoutes
 ]
 
 // 免登录路由

niucloud/app/adminapi/controller/school_approval/Config.php

@@ -5,6 +5,7 @@ namespace app\adminapi\controller\school_approval;
 
 use app\adminapi\controller\BaseAdminApi;
 use app\service\school_approval\SchoolApprovalConfigService;
+use core\base\BaseAdminController;
 use think\facade\Request;
 
 /**
@@ -12,7 +13,7 @@ use think\facade\Request;
  * Class Config
  * @package app\adminapi\controller\school_approval
  */
-class Config extends BaseAdminApi
+class Config extends BaseAdminController
 {
     /**
      * @var SchoolApprovalConfigService
@@ -33,19 +34,19 @@ class Config extends BaseAdminApi
         $page = input('page', 1);
         $limit = input('limit', 10);
         $status = input('status', '');
-        
+
         $where = [];
         if ($status !== '') {
             $where[] = ['status', '=', intval($status)];
         }
-        
+
         $config_name = input('config_name', '');
         if (!empty($config_name)) {
             $where[] = ['config_name', 'like', "%{$config_name}%"];
         }
-        
+
-        $data = $this->service->getList($where, $page, $limit);
+        $data = $this->service->getList($where, (int)$page, (int)$limit);
-        
+
         return success($data);
     }
 
@@ -58,12 +59,12 @@ class Config extends BaseAdminApi
         if (empty($id)) {
             return error('参数错误');
         }
-        
+
-        $info = $this->service->getInfo($id);
+        $info = $this->service->getInfo((int)$id);
         if (empty($info)) {
             return error('审批流配置不存在');
         }
-        
+
         return success($info);
     }
 
@@ -73,39 +74,39 @@ class Config extends BaseAdminApi
     public function add()
     {
         $data = Request::only(['config_name', 'description', 'status', 'nodes']);
-        
+
         // 验证参数
         if (empty($data['config_name'])) {
             return error('配置名称不能为空');
         }
-        
+
         if (empty($data['nodes']) || !is_array($data['nodes'])) {
             return error('至少需要添加一个审批节点');
         }
-        
+
         // 验证节点数据
         foreach ($data['nodes'] as $node) {
             if (empty($node['node_name'])) {
                 return error('节点名称不能为空');
             }
-            
+
             if (empty($node['approver_type'])) {
                 return error('审批人类型不能为空');
             }
-            
+
             if (empty($node['approver_ids'])) {
                 return error('审批人不能为空');
             }
         }
-        
+
         // 设置创建人ID
-        $data['creator_id'] = $this->user_info['uid'];
+        $data['creator_id'] = $this->request->uid();
-        
+
         try {
             $config_id = $this->service->add($data);
             return success(['id' => $config_id]);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 
@@ -115,40 +116,40 @@ class Config extends BaseAdminApi
     public function edit()
     {
         $data = Request::only(['id', 'config_name', 'description', 'status', 'nodes']);
-        
+
         // 验证参数
         if (empty($data['id'])) {
-            return error('参数错误');
+            return fail('参数错误');
         }
-        
+
         if (empty($data['config_name'])) {
-            return error('配置名称不能为空');
+            return fail('配置名称不能为空');
         }
-        
+
         if (empty($data['nodes']) || !is_array($data['nodes'])) {
-            return error('至少需要添加一个审批节点');
+            return fail('至少需要添加一个审批节点');
         }
-        
+
         // 验证节点数据
         foreach ($data['nodes'] as $node) {
             if (empty($node['node_name'])) {
-                return error('节点名称不能为空');
+                return fail('节点名称不能为空');
             }
-            
+
             if (empty($node['approver_type'])) {
-                return error('审批人类型不能为空');
+                return fail('审批人类型不能为空');
             }
-            
+
             if (empty($node['approver_ids'])) {
-                return error('审批人不能为空');
+                return fail('审批人不能为空');
             }
         }
-        
+
         try {
             $result = $this->service->edit($data);
             return success($result);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 
@@ -159,14 +160,14 @@ class Config extends BaseAdminApi
     {
         $id = input('id', 0);
         if (empty($id)) {
-            return error('参数错误');
+            return fail('参数错误');
         }
-        
+
         try {
-            $result = $this->service->delete($id);
+            $result = $this->service->delete((int)$id);
             return success($result);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 
@@ -177,16 +178,16 @@ class Config extends BaseAdminApi
     {
         $id = input('id', 0);
         $status = input('status', 0);
-        
+
         if (empty($id)) {
-            return error('参数错误');
+            return fail('参数错误');
         }
-        
+
         try {
             $result = $this->service->changeStatus($id, $status);
             return success($result);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 } 

niucloud/app/adminapi/controller/school_approval/Process.php

@@ -5,6 +5,7 @@ namespace app\adminapi\controller\school_approval;
 
 use app\adminapi\controller\BaseAdminApi;
 use app\service\school_approval\SchoolApprovalProcessService;
+use core\base\BaseAdminController;
 use think\facade\Request;
 
 /**
@@ -12,7 +13,7 @@ use think\facade\Request;
  * Class Process
  * @package app\adminapi\controller\school_approval
  */
-class Process extends BaseAdminApi
+class Process extends BaseAdminController
 {
     /**
      * @var SchoolApprovalProcessService
@@ -69,12 +70,12 @@ class Process extends BaseAdminApi
     {
         $id = input('id', 0);
         if (empty($id)) {
-            return error('参数错误');
+            return fail('参数错误');
         }
         
         $info = $this->service->getInfo($id);
         if (empty($info)) {
-            return error('审批流程不存在');
+            return fail('审批流程不存在');
         }
         
         return success($info);
@@ -90,11 +91,11 @@ class Process extends BaseAdminApi
         
         // 验证参数
         if (empty($data['process_name'])) {
-            return error('流程名称不能为空');
+            return fail('流程名称不能为空');
         }
         
         if (empty($config_id)) {
-            return error('请选择审批流配置');
+            return fail('请选择审批流配置');
         }
         
         // 设置申请人ID
@@ -104,7 +105,7 @@ class Process extends BaseAdminApi
             $process_id = $this->service->create($data, $config_id);
             return success(['id' => $process_id]);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 
@@ -118,18 +119,18 @@ class Process extends BaseAdminApi
         $remarks = input('remarks', '');
         
         if (empty($process_id)) {
-            return error('参数错误');
+            return fail('参数错误');
         }
         
         if (empty($status) || !in_array($status, ['approved', 'rejected'])) {
-            return error('请选择审批结果');
+            return fail('请选择审批结果');
         }
         
         try {
             $result = $this->service->approve($process_id, $this->user_info['uid'], $status, $remarks);
             return success($result);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 
@@ -141,14 +142,14 @@ class Process extends BaseAdminApi
         $process_id = input('process_id', 0);
         
         if (empty($process_id)) {
-            return error('参数错误');
+            return fail('参数错误');
         }
         
         try {
             $result = $this->service->cancel($process_id, $this->user_info['uid']);
             return success($result);
         } catch (\Exception $e) {
-            return error($e->getMessage());
+            return fail($e->getMessage());
         }
     }
 } 

niucloud/app/model/school_approval/SchoolApprovalConfig.php

@@ -22,7 +22,7 @@ class SchoolApprovalConfig extends Model
      * 模型名称
      * @var string
      */
-    protected $name = 'school_approval_config';
+    protected $name = 'approval_config';
 
     /**
      * 自动写入时间戳

niucloud/app/model/school_approval/SchoolApprovalConfigNode.php

@@ -22,7 +22,7 @@ class SchoolApprovalConfigNode extends Model
      * 模型名称
      * @var string
      */
-    protected $name = 'school_approval_config_node';
+    protected $name = 'approval_config_node';
 
     /**
      * 自动写入时间戳

niucloud/app/model/school_approval/SchoolApprovalParticipants.php

@@ -22,7 +22,7 @@ class SchoolApprovalParticipants extends Model
      * 模型名称
      * @var string
      */
-    protected $name = 'school_approval_participants';
+    protected $name = 'approval_participants';
 
     /**
      * 自动写入时间戳

niucloud/app/model/school_approval/SchoolApprovalProcess.php

@@ -22,7 +22,7 @@ class SchoolApprovalProcess extends Model
      * 模型名称
      * @var string
      */
-    protected $name = 'school_approval_process';
+    protected $name = 'approval_process';
 
     /**
      * 自动写入时间戳