diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php index 049ef54..c7893f8 100644 --- a/app/Admin/Controllers/Hr/EmployeeController.php +++ b/app/Admin/Controllers/Hr/EmployeeController.php @@ -73,11 +73,11 @@ class EmployeeController extends AdminController amisMake()->TextControl()->name('name')->label(__('employee.name'))->required(), amisMake()->TextControl()->name('phone')->label(__('employee.phone'))->required(), - // amisMake()->TagControl()->name('jobs')->label(__('employee.jobs')) - // ->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY) - // ->labelField('name') - // ->valueField('key') - // ->joinValues(), + amisMake()->TagControl()->name('jobs')->label(__('employee.jobs')) + ->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY) + ->labelField('name') + ->valueField('key') + ->joinValues(), amisMake()->DateControl()->name('join_at')->label(__('employee.join_at'))->format('YYYY-MM-DD'), amisMake()->TextControl()->name('remarks')->label(__('employee.remarks')), amisMake()->ImageControl()->name('prize_images')->label(__('employee.prize_images')) diff --git a/app/Admin/Controllers/Store/StoreController.php b/app/Admin/Controllers/Store/StoreController.php index 04079d5..8ee4b87 100644 --- a/app/Admin/Controllers/Store/StoreController.php +++ b/app/Admin/Controllers/Store/StoreController.php @@ -126,6 +126,6 @@ class StoreController extends AdminController public function shareList() { - return $this->service->listQuery()->get(['id', 'title']); + return $this->service->listQuery()->where('business_status', BusinessStatus::Open)->get(['id', 'title']); } } diff --git a/app/Console/Commands/EmployeeSign.php b/app/Console/Commands/EmployeeSign.php index 275441f..55ed41a 100644 --- a/app/Console/Commands/EmployeeSign.php +++ b/app/Console/Commands/EmployeeSign.php @@ -20,7 +20,7 @@ class EmployeeSign extends Command * * @var string */ - protected $description = '员工签到情况'; + protected $description = '员工签到情况统计'; /** * Execute the console command. diff --git a/app/Http/Controllers/Api/Auth/UserController.php b/app/Http/Controllers/Api/Auth/UserController.php index b06a462..5d18383 100644 --- a/app/Http/Controllers/Api/Auth/UserController.php +++ b/app/Http/Controllers/Api/Auth/UserController.php @@ -8,7 +8,7 @@ use App\Models\{Employee, Store, AdminUser}; use Illuminate\Http\{Request, Response}; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\ValidationException; -use App\Enums\UserRole; +use App\Enums\{UserRole, BusinessStatus}; use App\Http\Resources\KeywordResource; use App\Admin\Services\EmployeeService; use App\Http\Resources\StoreResource; @@ -61,7 +61,7 @@ class UserController extends Controller $user = $this->guard()->user(); $role = $user->userRole(); $list = []; - $query = Store::filter($request->all()); + $query = Store::filter($request->all())->where('business_status', BusinessStatus::Open); if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) { $list = [Store::findOrFail($user->store_id)]; } else if (in_array(UserRole::Admin, $role)) { diff --git a/database/seeders/KeywordSeeder.php b/database/seeders/KeywordSeeder.php index 2847ff9..a8c47f2 100644 --- a/database/seeders/KeywordSeeder.php +++ b/database/seeders/KeywordSeeder.php @@ -34,7 +34,7 @@ class KeywordSeeder extends Seeder [ 'key' => 'job', 'name' => '职位', - 'children' => ['普通员工', '店长', '区域经理'], + 'children' => ['普通员工', '店长'], ], [ 'key' => 'store_category',