首次合并dev分支到main中

Reviewed-on: #2

app/admin/controller/Ticket.php

@@ -8,8 +8,6 @@ use app\common\model\Tickets;
 use app\common\service\TicketNotifier;
 use app\common\service\TicketService;
 use think\facade\Session;
-use app\common\service\TicketScope;
-
 
 class Ticket extends BaseController
 {
@@ -17,7 +15,7 @@ class Ticket extends BaseController
     /**
      * 查询工单
      */
-    public function fetchTickets(TicketService $ticketService)
+    public function ticketsFind(TicketService $ticketService)
     {
         // 在控制器明确接收参数
         $params = [
@@ -34,11 +32,7 @@ class Ticket extends BaseController
         $limit = min(max(($params['limit'] ?? 20), 1), 100);
         $order = strtolower($params['sortOrder'] ?? 'desc') === 'asc' ? 'asc' : 'desc';
 
-        try {
+        $result = $ticketService->queryTickets($params, $page, $limit, $order);
-            $result = $ticketService->queryTickets($params, $page, $limit, $order, TicketScope::admin());
-        } catch (\Exception $e) {
-            return $this->error($e->getMessage());
-        }
 
         return $this->success('查询成功', $result);
     }
@@ -53,13 +47,13 @@ class Ticket extends BaseController
 
         try {
             $result = $ticketService->createTicket($data);
+            return $this->success('创建成功', $result);
         } catch (\Exception $e) {
             if ($e->getCode() === 409) {
                 return $this->error($e->getMessage(), ['confirm' => true], 409);
             }
             return $this->error($e->getMessage());
         }
-        return $this->success('创建成功', $result);
     }
 
 
@@ -76,11 +70,10 @@ class Ticket extends BaseController
 
         try {
             $result = $ticketService->updateTicket($id, $data, $allowFields, $adminId, true);
+            return $this->success('更新成功', $result);
         } catch (\Exception $e) {
             return $this->error($e->getMessage());
         }
-
-        return $this->success('更新成功', $result);
     }
 
 

app/admin/route/app.php

@@ -5,7 +5,7 @@ use app\admin\middleware\Auth;
 use app\middleware\CheckLogin;
 
 Route::group(function () {
-    Route::get('ticketsfind', 'Ticket/fetchTickets');
+    Route::get('ticketsfind', 'Ticket/ticketsFind');
     Route::post('addticket', 'Ticket/createTicket');
     Route::put('ticket/:id', 'Ticket/updateTicket');
     Route::delete('ticket/:id', 'Ticket/deleteTicket');

app/admin/service/AccountService.php

@@ -12,20 +12,15 @@ class AccountService
     {
         $users = UserModel::with('company')->select();
         return $users->map(function ($user) {
-            $companyName = $user->role === 'client' && (bool) $user->can_view_all_tickets
-                ? '全部客户'
-                : ($user->company->company_name ?? '');
-
             return [
                 'id' => $user->id,
                 'company' => [
                     'id' => $user->company_id,
-                    'company_name' => $companyName
+                    'company_name' => $user->company->company_name
                 ],
                 'username' => $user->username,
                 'real_name' => $user->real_name,
                 'role' => $user->role,
-                'can_view_all_tickets' => (bool) $user->can_view_all_tickets,
                 'status' => $user->status,
             ];
         })->toArray();
@@ -45,34 +40,19 @@ class AccountService
             throw new \Exception('用户名已存在');
         }
 
-        $role = $data['role'] ?? 'user';
-        $companyId = (int) ($data['company_id'] ?? 0);
-        $canViewAllTickets = $role === 'client' && !empty($data['can_view_all_tickets']);
-
-        // 系统中只允许存在一个可查看全部工单的客户汇总账号。
-        if ($canViewAllTickets) {
-            $allAccessClient = UserModel::where('role', 'client')
-                ->where('can_view_all_tickets', 1)
-                ->find();
-            if ($allAccessClient) {
-                throw new \Exception('已存在可查看全部工单的客户账号');
-            }
-        }
-
         $insertData = [
-            'company_id' => $companyId,
+            'company_id' => $data['company_id'] ?? 0,
             'username' => $data['username'],
             'real_name' =>  $data['real_name'] ?? $data['username'],
             'password' => password_hash('123456', PASSWORD_DEFAULT),
-            'role' => $role,
+            'role' => $data['role'] ?? 'user',
-            'can_view_all_tickets' => $canViewAllTickets ? 1 : 0,
             'status'   => 1,
         ];
 
         $user = UserModel::create($insertData);
 
         /** @var \think\Model $user */
-        return $user->visible(['id', 'username', 'real_name', 'role', 'can_view_all_tickets', 'status'])->toArray();
+        return $user->visible(['id', 'username', 'real_name', 'role', 'status'])->toArray();
     }
 
     /* 更新用户状态 */

app/api/controller/Index.php

@@ -1,12 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\api\controller;
-
-class Index
-{
-    public function index()
-    {
-        return '您好！这是一个[api]示例应用';
-    }
-}

app/common/model/Tickets.php

@@ -16,6 +16,7 @@ class Tickets extends Model
     protected $createTime = 'create_time';
     protected $updateTime = 'update_time';
 
+
     # 定义字段类型
     protected $type = [
         'id' => 'integer',
@@ -33,13 +34,6 @@ class Tickets extends Model
     ];
 
 
-    # 定义状态常量
-    const STATUS_UNASSIGNED = 0;
-    const STATUS_PROCESSING = 1;
-    const STATUS_COMPLETED  = 2;
-    const STATUS_CLOSED     = 3;
-
-
     /*
         时间戳获取器
     */

app/common/model/User.php

@@ -12,10 +12,6 @@ class User extends Model
 {
     protected $table = 'users';
 
-    protected $type = [
-        'can_view_all_tickets' => 'boolean',
-    ];
-
     public function company(){
         return $this->belongsTo(Companys::class,'company_id','id');
     }

app/common/service/AuthService.php

@@ -18,6 +18,7 @@ class AuthService
             ->find();
 
 
+
         if (!$user || !password_verify($password, $user['password'])) {
             throw new \Exception('用户名或密码错误');
         }
@@ -30,16 +31,13 @@ class AuthService
         $userInfo = [
             'id'           => $user['id'], // 用户ID
             'company_id'   => $user['company_id'], // 所属公司ID
-            'company_name' => $user['role'] === 'client' && (bool) $user['can_view_all_tickets']
+            'company_name' => $user['company']['company_name'], // 所属公司名称
-                ? '全部客户'
-                : ($user['company']['company_name'] ?? ''), // 所属公司名称
             'username'     => $user['username'],
             'role'         => $user['role'],
-            'can_view_all_tickets' => (bool) $user['can_view_all_tickets'],
         ];
 
         Session::set('user_info', $userInfo);
 
-        return $userInfo;     // 为了方便前端展示用户信息
+        return $userInfo;
     }
 }

app/common/service/TicketScope.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace app\common\service;
-
-/**
- * 把当前用户能看哪些工单封装成一个明确的对象TicketScope，避免用零散变量或含义不清的数组传递数据范围
- * final 表示不允许被其他类继承
- */
-final class TicketScope
-{
-    # readonly  仅在PHP8.1中存在，当前版本8.0.2
-    private function __construct(
-        public  string $type,
-        public  ?int $staffId = null,
-        public  ?int $clientId = null
-    ) {}
-
-    /** 管理员：不限制状态、不限制归属 */
-    public static function admin(): self
-    {
-        return new self('admin');
-    }
-
-    /** 员工：未分配全部可见，其余状态仅自己 */
-    public static function staff(int $staffId): self
-    {
-        return new self('staff', staffId: $staffId);
-    }
-
-    /** 客户：$clientId 只能看自己的，传null可以看当前公司所有的 */
-    public static function client(?int $clientId): self
-    {
-        return new self('client', clientId: $clientId);
-    }
-}

app/common/service/TicketService.php

@@ -2,15 +2,11 @@
 
 namespace app\common\service;
 
-use app\admin\controller\Ticket;
 use app\common\model\Tickets;
 use app\common\model\CompanyOperators;
 use app\common\model\Companys;
 use app\common\model\User;
 use think\facade\Db;
-use app\common\service\TicketScope;
-
-
 
 class TicketService
 {
@@ -21,14 +17,12 @@ class TicketService
      * @param int $limit 每页数量
      * @param string $order 排序方式
      */
-    public function queryTickets(array $params, int $page, int $limit, string $order, TicketScope $scope)
+    public function queryTickets(array $params, int $page, int $limit, string $order)
     {
         try {
             // 查询构造器
             $query = Tickets::with(['ticketStaff', 'ticketCompany', 'ticketOperator']);
 
-            $this->applyScope($query, $scope);
-
             $equalFilters = ['operator_id', 'user_id', 'status'];
             foreach ($equalFilters as $field) {
                 if (isset($params[$field]) && $params[$field] !== '') {
@@ -62,21 +56,6 @@ class TicketService
     }
 
 
-    private function applyScope($query, TicketScope $scope): void
-    {
-        match ($scope->type) {
-            'client' => null,
-            'staff' => $query->where(fn($q) => $q
-                ->where('status', Tickets::STATUS_UNASSIGNED)
-                ->where('user_id', $scope->staffId)),
-        };
-    }
-
-
-
-
-
-
     /**
      * 创建工单业务逻辑
      * @param array $data 工单数据
@@ -141,8 +120,6 @@ class TicketService
             throw new \Exception('工单不存在');
         }
 
-    
-
         // 提取 $allowFields 允许修改的字段
         $updateData = [];
         foreach ($allowFields as $field) {

app/index/controller/ClientTicket.php

@@ -13,11 +13,9 @@ class ClientTicket extends BaseController
      */
     public function getClientTickets(ClientTicketService $ClientTicketService)
     {
-        $clientCompanyId = (int) Session::get('user_info.company_id'); // 获取当前登录客户ID
+        $clientCompanyId = Session::get('user_info.company_id'); // 获取当前登录客户ID
-        $canViewAll = Session::get('user_info.role') === 'client'
-            && (bool) Session::get('user_info.can_view_all_tickets');
         try {
-            $tickets = $ClientTicketService->getClientTickets($clientCompanyId, $canViewAll);
+            $tickets = $ClientTicketService->getClientTickets($clientCompanyId);
             return $this->success('获取成功', $tickets);
         } catch (\Exception $e) {
             return $this->error($e->getMessage());

app/index/controller/Login.php

@@ -45,6 +45,6 @@ class Login extends BaseController
     public function logout()
     {
         Session::clear();
-        return $this->success('退出登录');
+        return $this->success('退出成功');
     }
 }

app/index/controller/Ticket.php

@@ -15,12 +15,9 @@ class Ticket extends BaseController
     {
 
         $isUser = Session::get('user_info.role') === 'user'; // 获取当前登录ID
-        $post = $this->request->post();
+        $data = $this->request->post();
-
-        $data = [
-            'datanum' => $post['datanum']
-        ]
 
+        $allowFields = ['datanum', 'progress', 'status', 'remark', 'lock_time', 'user_id'];
 
         try {
             $result = $ticketService->updateTicket($id, $data, $allowFields, $isUser, false);

app/index/controller/client/Index.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace app\client\controller;
-
-use app\BaseController;
-use app\index\service\ClientTicketService;
-use think\facade\Session;
-
-class Index extends BaseController
-{
-    /**
-     * 获取客户关联工单
-     */
-    public function fetchTickets(ClientTicketService $ClientTicketService)
-    {
-        $clientCompanyId = (int) Session::get('user_info.company_id'); // 获取当前登录客户ID
-        $canViewAll = Session::get('user_info.role') === 'client'
-            && (bool) Session::get('user_info.can_view_all_tickets');
-        try {
-            $tickets = $ClientTicketService->getClientTickets($clientCompanyId, $canViewAll);
-            return $this->success('获取成功', $tickets);
-        } catch (\Exception $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-}

app/index/controller/staff/Ticket.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace app\staff\controller;
-
-use app\BaseController;
-use app\common\service\TicketService;
-use app\common\service\TicketScope;
-use think\facade\Session;
-
-class Ticket extends BaseController
-{
-
-    public function fetchTickets(TicketService $TicketService)
-    {
-        $params = [
-            "page" => $this->request->param('page', 1, 'intval'),
-            "limit" => $this->request->param('limit', 20, 'intval'),
-            "operator_id" => $this->request->param('operator_id', null),
-            "status" => $this->request->param('status', null),
-            "searchKeyword" => $this->request->param('search', null),
-            "sortOrder" => $this->request->param('sort_order', 'desc'),
-        ];
-
-        $staffId = (int) Session::get('user_info.id');  // 若没有，则为0
-        if ($staffId <= 0) {
-            return $this->error('无法获取当前员工信息');
-        }
-
-        $page = max(($params['page'] ?? 1), 1);
-        $limit = min(max(($params['limit'] ?? 20), 1), 100);
-        $order = strtolower($params['sortOrder'] ?? 'desc') === 'asc' ? 'asc' : 'desc';
-
-        try {
-            $result = $TicketService->queryTickets($params, $page, $limit, $order, TicketScope::staff($staffId));
-        } catch (\Exception $e) {
-            return $this->error($e->getMessage());
-        }
-
-        return $this->success('查询成功', $result);
-    }
-
-
-
-
-
-    /**
-     * 更新工单(员工调用)
-     */
-    public function updateTicket(TicketService $ticketService, $id)
-    {
-
-        $isUser = Session::get('user_info.role') === 'user';
-        $data = $this->request->post();
-
-        $allowFields = ['datanum', 'progress', 'status', 'remark', 'lock_time', 'user_id'];
-
-        try {
-            $result = $ticketService->updateTicket($id, $data, $allowFields, $isUser, false);
-            return $this->success('更新成功', $result);
-        } catch (\Exception $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-}

app/index/service/ClientTicketService.php

@@ -8,20 +8,17 @@ use app\common\model\Tickets;
 class ClientTicketService
 {
     /* 获取客户关联工单 */
-    public function getClientTickets(int $clientCompanyId, bool $canViewAll = false)
+    public function getClientTickets($clientCompanyId)
     {
-        // 普通客户仅查询所属公司的工单；唯一的汇总客户账号可查看全部。
+        # 查询当前登录用户所对应的公司的工单
-        $query = Tickets::whereIn('status', [0, 1, 2]);
+        $tickets = Tickets::where('company_id', $clientCompanyId)->select();
-        if (!$canViewAll) {
-            $query->where('company_id', $clientCompanyId);
-        }
-
-        $tickets = $query->select();
 
         $newList = [];
         foreach ($tickets as $ticket) {
-            $ticket->visible(['id', 'website', 'datanum', 'progress', 'status']);
+            if (in_array($ticket->status, [0, 1, 2])) {
-            $newList[] = $ticket->toArray();
+                $ticket->visible(['id', 'website', 'datanum', 'progress', 'status']);
+                $newList[] = $ticket->toArray();
+            }
         }
 
         return $newList;

config/session.php

@@ -4,6 +4,7 @@
 // +----------------------------------------------------------------------
 
 return [
+    // session name
     'name'           => 'PHPSESSID',
     // SESSION_ID的提交变量,解决flash上传跨域
     'var_session_id' => '',

database/migrations/20260819_add_can_view_all_tickets_to_users.sql

@@ -1,6 +0,0 @@
--- Up: 为客户汇总账号增加显式的全量工单查看标记。
-ALTER TABLE `users`
-    ADD COLUMN `can_view_all_tickets` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `role`;
-
--- Rollback（需要回滚时单独执行）：
--- ALTER TABLE `users` DROP COLUMN `can_view_all_tickets`;