From d33c25838b363202a6f6244fb6350bf074a47fec Mon Sep 17 00:00:00 2001 From: "1213317725@qq.com" <1213317725@qq.com> Date: Fri, 6 Jun 2025 18:11:35 +0800 Subject: [PATCH] 1 --- .../campus_person_role/campus_person_role.vue | 2 +- niucloud/app/adminapi/route/sys.php | 79 ++++++++++--------- niucloud/app/common.php | 2 +- .../CampusPersonRoleService.php | 7 +- .../CustomerResourcesService.php | 17 +++- 5 files changed, 60 insertions(+), 47 deletions(-) diff --git a/admin/src/app/views/campus_person_role/campus_person_role.vue b/admin/src/app/views/campus_person_role/campus_person_role.vue index c4534b1b..6a0cc47d 100644 --- a/admin/src/app/views/campus_person_role/campus_person_role.vue +++ b/admin/src/app/views/campus_person_role/campus_person_role.vue @@ -219,7 +219,7 @@ if(pageName == '市场人员列表'){ campusPersonRoleTable.searchParam.dept_id = 1; }else if(pageName == '销售人员列表'){ campusPersonRoleTable.searchParam.dept_id = 2; - campusPersonRoleTable.searchParam.role_id = 2; + // campusPersonRoleTable.searchParam.role_id = 2; }else if(pageName == '教练管理'){ campusPersonRoleTable.searchParam.role_id = 5; } diff --git a/niucloud/app/adminapi/route/sys.php b/niucloud/app/adminapi/route/sys.php index caf37ca9..7a4d9408 100644 --- a/niucloud/app/adminapi/route/sys.php +++ b/niucloud/app/adminapi/route/sys.php @@ -96,46 +96,7 @@ Route::group('sys', function() { // 开发者key Route::get('config/developer_token', 'sys.Config/getDeveloperToken'); - /***************************************************** 图片上传 ****************************************************/ - //附件图片上传 - Route::post('image', 'upload.Upload/image'); - //附件视频上传 - Route::post('video', 'upload.Upload/video'); - //附件上传 - Route::post('document/:type', 'upload.Upload/document'); - //附件列表 - Route::get('attachment', 'sys.Attachment/lists'); - //附件列表 - Route::delete('attachment/:att_id', 'sys.Attachment/del'); - //附件删除 - Route::delete('attachment/del', 'sys.Attachment/batchDel'); - //移动图片分组 -// Route::put('attachment/move/:att_id', 'sys.Attachment/moveCategory'); - //批量移动图片分组 - Route::put('attachment/batchmove', 'sys.Attachment/batchMoveCategory'); - //附件组新增 - Route::post('attachment/category', 'sys.Attachment/addCategory'); - //附件组更新 - Route::put('attachment/category/:id', 'sys.Attachment/editCategory'); - //附件组列表 - Route::get('attachment/category', 'sys.Attachment/categoryLists'); - //删除单个附件组 - Route::delete('attachment/category/:id', 'sys.Attachment/deleteCategory'); - //获取存储列表 - Route::get('storage', 'upload.Storage/storageList'); - //存储详情 - Route::get('storage/:storage_type', 'upload.Storage/storageConfig'); - //存储修改 - Route::put('storage/:storage_type', 'upload.Storage/editStorage'); - //上传设置 - Route::put('upload/config', 'upload.Upload/setUploadConfig'); - //获取上传设置 - Route::get('upload/config', 'upload.Upload/getUploadConfig'); - // 获取图标库列表 - Route::get('attachment/icon_category', 'sys.Attachment/getIconCategoryList'); - // 获取图标库列表 - Route::get('attachment/icon', 'sys.Attachment/getIconList'); /***************************************************** 协议管理 ****************************************************/ //消息列表 Route::get('agreement', 'sys.Agreement/lists'); @@ -355,6 +316,46 @@ Route::group('sys', function() { Route::get('role_all', 'sys.System/role_all'); Route::get('departments_all', 'sys.System/departments_all'); + /***************************************************** 图片上传 ****************************************************/ + //附件图片上传 + Route::post('image', 'upload.Upload/image'); + //附件视频上传 + Route::post('video', 'upload.Upload/video'); + //附件上传 + Route::post('document/:type', 'upload.Upload/document'); + //附件列表 + Route::get('attachment', 'sys.Attachment/lists'); + //附件列表 + Route::delete('attachment/:att_id', 'sys.Attachment/del'); + + //附件删除 + Route::delete('attachment/del', 'sys.Attachment/batchDel'); + //移动图片分组 +// Route::put('attachment/move/:att_id', 'sys.Attachment/moveCategory'); + //批量移动图片分组 + Route::put('attachment/batchmove', 'sys.Attachment/batchMoveCategory'); + //附件组新增 + Route::post('attachment/category', 'sys.Attachment/addCategory'); + //附件组更新 + Route::put('attachment/category/:id', 'sys.Attachment/editCategory'); + //附件组列表 + Route::get('attachment/category', 'sys.Attachment/categoryLists'); + //删除单个附件组 + Route::delete('attachment/category/:id', 'sys.Attachment/deleteCategory'); + //获取存储列表 + Route::get('storage', 'upload.Storage/storageList'); + //存储详情 + Route::get('storage/:storage_type', 'upload.Storage/storageConfig'); + //存储修改 + Route::put('storage/:storage_type', 'upload.Storage/editStorage'); + //上传设置 + Route::put('upload/config', 'upload.Upload/setUploadConfig'); + //获取上传设置 + Route::get('upload/config', 'upload.Upload/getUploadConfig'); + // 获取图标库列表 + Route::get('attachment/icon_category', 'sys.Attachment/getIconCategoryList'); + // 获取图标库列表 + Route::get('attachment/icon', 'sys.Attachment/getIconList'); Route::get('web/website', 'sys.Config/getWebsite'); // 获取版权信息 diff --git a/niucloud/app/common.php b/niucloud/app/common.php index b043c134..dbf1b4f6 100644 --- a/niucloud/app/common.php +++ b/niucloud/app/common.php @@ -1037,7 +1037,7 @@ function get_campus_where($user_id,$field="campus_id") if($user_id > 1){ $person_id = $person->where(['sys_user_id' => $user_id])->value("id"); $role_info = $campusPersonRole->where(['person_id' => $person_id])->find(); - if (!in_array($role_info['role_id'], [1, 7])) { + if (!in_array($role_info['role_id'], [1,7,8])) { $where[] = [$field,'=',$role_info['campus_id']]; } } diff --git a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php index 6e61231d..e4cac74f 100644 --- a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php +++ b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php @@ -47,9 +47,9 @@ class CampusPersonRoleService extends BaseAdminService $where[] = ['a.campus_id','=',$data['campus_id']]; } - if($data['role_id']){ - $where[] = ['a.role_id','=',$data['role_id']]; - } +// if($data['role_id']){ +// $where[] = ['a.role_id','=',$data['role_id']]; +// } if($data['dept_id']){ $where[] = ['a.dept_id','=',$data['dept_id']]; @@ -138,6 +138,7 @@ class CampusPersonRoleService extends BaseAdminService public function getPersonnelAll(){ $person_ids = $this->model->column("person_id"); + $personnelModel = new Personnel(); return $personnelModel->where([['id','not in',$person_ids]])->select()->toArray(); } diff --git a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php index fa0625cf..e53f7954 100644 --- a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php +++ b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php @@ -156,6 +156,10 @@ class CustomerResourcesService extends BaseAdminService return fail("超级管理员不允许添加资源"); } + if($this->model->where(['phone_number' => $data['phone_number']])->find()){ + return fail("资源重复添加"); + } + $sixSpeed = new SixSpeed(); // $data['member_label'] = json_encode($data['member_label']); @@ -214,6 +218,13 @@ class CustomerResourcesService extends BaseAdminService // return fail("操作失败"); // } + if($this->model->where([ + ['phone_number','=',$data['phone_number']], + ['id','<>',$id] + ])->find()){ + return fail("资源重复添加"); + } + // $data['consultant'] = 1; $res = $this->model->where([['id', '=', $id]])->findOrEmpty()->toArray(); @@ -319,9 +330,9 @@ class CustomerResourcesService extends BaseAdminService $school_campus_person_role = new CampusPersonRole(); $personnelModel = new Personnel(); $where = []; - if ($data['role_id']) { - $where[] = ['a.role_id', '=', $data['role_id']]; - } +// if ($data['role_id']) { +// $where[] = ['a.role_id', '=', $data['role_id']]; +// } if ($data['dept_id']) { $where[] = ['a.dept_id', '=', $data['dept_id']]; }