From 4db10be4425ff870ffa1259593d4b6d5b87cc338 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Thu, 27 Feb 2025 17:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BA=BA=E5=8A=9B=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E3=80=81=E6=97=A5=E5=B8=B8=E5=8A=9E=E5=85=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/article/Article.php | 112 +++++++++++++++ app/common/model/article/ArticleCate.php | 74 ++++++++++ app/common/model/works/rlzy/OaAdmin.php | 2 +- .../model/works/rlzy/OaDepartmentChange.php | 2 +- .../model/works/rlzy/OaPersonalQuit.php | 2 +- .../article/ArticleCateController.php | 134 +++++++++++++++++ .../controller/article/ArticleController.php | 114 +++++++++++++++ .../works/{rlzy => hr}/OaAdminController.php | 2 +- .../OaDepartmentChangeController.php | 14 +- .../{rlzy => hr}/OaPersonalQuitController.php | 12 +- .../works/rcbg/OaPlanController.php | 10 +- .../works/rcbg/OaScheduleController.php | 10 +- .../works/rcbg/OaWorkCommentController.php | 10 +- .../works/rcbg/OaWorkController.php | 10 +- .../works/rcbg/OaWorkRecordController.php | 10 +- app/oa/http/middleware/InitMiddleware.php | 7 +- app/oa/http/middleware/LoginMiddleware.php | 39 ++--- app/oa/lists/article/ArticleCateLists.php | 98 +++++++++++++ app/oa/lists/article/ArticleLists.php | 99 +++++++++++++ .../lists/works/{rlzy => hr}/OaAdminLists.php | 6 +- .../{rlzy => hr}/OaDepartmentChangeLists.php | 6 +- .../{rlzy => hr}/OaPersonalQuitLists.php | 6 +- app/oa/lists/works/rcbg/OaPlanLists.php | 4 +- app/oa/lists/works/rcbg/OaScheduleLists.php | 4 +- .../lists/works/rcbg/OaWorkCommentLists.php | 4 +- app/oa/lists/works/rcbg/OaWorkLists.php | 4 +- app/oa/lists/works/rcbg/OaWorkRecordLists.php | 4 +- app/oa/logic/article/ArticleCateLogic.php | 127 ++++++++++++++++ app/oa/logic/article/ArticleLogic.php | 121 ++++++++++++++++ .../logic/works/{rlzy => hr}/OaAdminLogic.php | 4 +- .../{rlzy => hr}/OaDepartmentChangeLogic.php | 4 +- .../{rlzy => hr}/OaPersonalQuitLogic.php | 4 +- .../validate/article/ArticleCateValidate.php | 136 ++++++++++++++++++ app/oa/validate/article/ArticleValidate.php | 108 ++++++++++++++ .../works/{rlzy => hr}/OaAdminValidate.php | 4 +- .../OaDepartmentChangeValidate.php | 4 +- .../{rlzy => hr}/OaPersonalQuitValidate.php | 4 +- config/middleware.php | 12 ++ 38 files changed, 1231 insertions(+), 96 deletions(-) create mode 100644 app/common/model/article/Article.php create mode 100644 app/common/model/article/ArticleCate.php create mode 100644 app/oa/controller/article/ArticleCateController.php create mode 100644 app/oa/controller/article/ArticleController.php rename app/oa/controller/works/{rlzy => hr}/OaAdminController.php (98%) rename app/oa/controller/works/{rlzy => hr}/OaDepartmentChangeController.php (89%) rename app/oa/controller/works/{rlzy => hr}/OaPersonalQuitController.php (90%) create mode 100644 app/oa/lists/article/ArticleCateLists.php create mode 100644 app/oa/lists/article/ArticleLists.php rename app/oa/lists/works/{rlzy => hr}/OaAdminLists.php (95%) rename app/oa/lists/works/{rlzy => hr}/OaDepartmentChangeLists.php (95%) rename app/oa/lists/works/{rlzy => hr}/OaPersonalQuitLists.php (95%) create mode 100644 app/oa/logic/article/ArticleCateLogic.php create mode 100644 app/oa/logic/article/ArticleLogic.php rename app/oa/logic/works/{rlzy => hr}/OaAdminLogic.php (99%) rename app/oa/logic/works/{rlzy => hr}/OaDepartmentChangeLogic.php (97%) rename app/oa/logic/works/{rlzy => hr}/OaPersonalQuitLogic.php (98%) create mode 100644 app/oa/validate/article/ArticleCateValidate.php create mode 100644 app/oa/validate/article/ArticleValidate.php rename app/oa/validate/works/{rlzy => hr}/OaAdminValidate.php (98%) rename app/oa/validate/works/{rlzy => hr}/OaDepartmentChangeValidate.php (97%) rename app/oa/validate/works/{rlzy => hr}/OaPersonalQuitValidate.php (97%) diff --git a/app/common/model/article/Article.php b/app/common/model/article/Article.php new file mode 100644 index 0000000..f079ebc --- /dev/null +++ b/app/common/model/article/Article.php @@ -0,0 +1,112 @@ +value('name'); + } + + /** + * @notes 浏览量 + * @param $value + * @param $data + * @return mixed + * @author 段誉 + * @date 2022/9/15 11:33 + */ + public function getClickAttr($value, $data) + { + return $data['click_actual'] + $data['click_virtual']; + } + + + /** + * @notes 设置图片域名 + * @param $value + * @param $data + * @return array|string|string[]|null + * @author 段誉 + * @date 2022/9/28 10:17 + */ + public function getContentAttr($value, $data) + { + return get_file_domain($value); + } + + + /** + * @notes 清除图片域名 + * @param $value + * @param $data + * @return array|string|string[] + * @author 段誉 + * @date 2022/9/28 10:17 + */ + public function setContentAttr($value, $data) + { + return clear_file_domain($value); + } + + + /** + * @notes 获取文章详情 + * @param $id + * @return array + * @author 段誉 + * @date 2022/10/20 15:23 + */ + public static function getArticleDetailArr(int $id) + { + $article = Article::where(['id' => $id, 'is_show' => YesNoEnum::YES]) + ->findOrEmpty(); + + if ($article->isEmpty()) { + return []; + } + + // 增加点击量 + $article->click_actual += 1; + $article->save(); + + return $article->append(['click']) + ->hidden(['click_virtual', 'click_actual']) + ->toArray(); + } + +} \ No newline at end of file diff --git a/app/common/model/article/ArticleCate.php b/app/common/model/article/ArticleCate.php new file mode 100644 index 0000000..3bef304 --- /dev/null +++ b/app/common/model/article/ArticleCate.php @@ -0,0 +1,74 @@ +hasMany(Article::class, 'cid', 'id'); + } + + + /** + * @notes 状态描述 + * @param $value + * @param $data + * @return string + * @author 段誉 + * @date 2022/9/15 11:25 + */ + public function getIsShowDescAttr($value, $data) + { + return $data['is_show'] ? '启用' : '停用'; + } + + + /** + * @notes 文章数量 + * @param $value + * @param $data + * @return int + * @author 段誉 + * @date 2022/9/15 11:32 + */ + public function getArticleCountAttr($value, $data) + { + return Article::where(['cid' => $data['id']])->count('id'); + } + + + + +} \ No newline at end of file diff --git a/app/common/model/works/rlzy/OaAdmin.php b/app/common/model/works/rlzy/OaAdmin.php index 4d5cc4b..ab62a1f 100644 --- a/app/common/model/works/rlzy/OaAdmin.php +++ b/app/common/model/works/rlzy/OaAdmin.php @@ -22,7 +22,7 @@ use think\model\concern\SoftDelete; /** * 企业员工模型 * Class OaAdmin - * @package app\common\model\works\rlzy + * @package app\common\model\works\hr */ class OaAdmin extends BaseModel { diff --git a/app/common/model/works/rlzy/OaDepartmentChange.php b/app/common/model/works/rlzy/OaDepartmentChange.php index 0b8018c..3c540f3 100644 --- a/app/common/model/works/rlzy/OaDepartmentChange.php +++ b/app/common/model/works/rlzy/OaDepartmentChange.php @@ -24,7 +24,7 @@ use think\model\concern\SoftDelete; /** * 人事调动模型 * Class OaDepartmentChange - * @package app\common\model\works\rlzy + * @package app\common\model\works\hr */ class OaDepartmentChange extends BaseModel { diff --git a/app/common/model/works/rlzy/OaPersonalQuit.php b/app/common/model/works/rlzy/OaPersonalQuit.php index fe7c0e7..4faff02 100644 --- a/app/common/model/works/rlzy/OaPersonalQuit.php +++ b/app/common/model/works/rlzy/OaPersonalQuit.php @@ -22,7 +22,7 @@ use think\model\concern\SoftDelete; /** * 离职档案模型 * Class OaPersonalQuit - * @package app\common\model\works\rlzy + * @package app\common\model\works\hr */ class OaPersonalQuit extends BaseModel { diff --git a/app/oa/controller/article/ArticleCateController.php b/app/oa/controller/article/ArticleCateController.php new file mode 100644 index 0000000..f352c70 --- /dev/null +++ b/app/oa/controller/article/ArticleCateController.php @@ -0,0 +1,134 @@ +dataLists(new ArticleCateLists()); + } + + + /** + * @notes 添加资讯分类 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/21 17:31 + */ + public function add() + { + $params = (new ArticleCateValidate())->post()->goCheck('add'); + ArticleCateLogic::add($params); + return $this->success('添加成功', [], 1, 1); + } + + + /** + * @notes 编辑资讯分类 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/21 17:49 + */ + public function edit() + { + $params = (new ArticleCateValidate())->post()->goCheck('edit'); + $result = ArticleCateLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ArticleCateLogic::getError()); + } + + + /** + * @notes 删除资讯分类 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/21 17:52 + */ + public function delete() + { + $params = (new ArticleCateValidate())->post()->goCheck('delete'); + ArticleCateLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 资讯分类详情 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/21 17:54 + */ + public function detail() + { + $params = (new ArticleCateValidate())->goCheck('detail'); + $result = ArticleCateLogic::detail($params); + return $this->data($result); + } + + + /** + * @notes 更改资讯分类状态 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/21 10:15 + */ + public function updateStatus() + { + $params = (new ArticleCateValidate())->post()->goCheck('status'); + $result = ArticleCateLogic::updateStatus($params); + if (true === $result) { + return $this->success('修改成功', [], 1, 1); + } + return $this->fail(ArticleCateLogic::getError()); + } + + + /** + * @notes 获取文章分类 + * @return \think\response\Json + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/10/13 10:54 + */ + public function all() + { + $result = ArticleCateLogic::getAllData(); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/oa/controller/article/ArticleController.php b/app/oa/controller/article/ArticleController.php new file mode 100644 index 0000000..fbc7bdc --- /dev/null +++ b/app/oa/controller/article/ArticleController.php @@ -0,0 +1,114 @@ +dataLists(new ArticleLists()); + } + + /** + * @notes 添加资讯 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/22 9:57 + */ + public function add() + { + $params = (new ArticleValidate())->post()->goCheck('add'); + ArticleLogic::add($params); + return $this->success('添加成功', [], 1, 1); + } + + /** + * @notes 编辑资讯 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/22 10:12 + */ + public function edit() + { + $params = (new ArticleValidate())->post()->goCheck('edit'); + $result = ArticleLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ArticleLogic::getError()); + } + + /** + * @notes 删除资讯 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/22 10:17 + */ + public function delete() + { + $params = (new ArticleValidate())->post()->goCheck('delete'); + ArticleLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + /** + * @notes 资讯详情 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/22 10:15 + */ + public function detail() + { + $params = (new ArticleValidate())->goCheck('detail'); + $result = ArticleLogic::detail($params); + return $this->data($result); + } + + + /** + * @notes 更改资讯状态 + * @return \think\response\Json + * @author heshihu + * @date 2022/2/22 10:18 + */ + public function updateStatus() + { + $params = (new ArticleValidate())->post()->goCheck('status'); + $result = ArticleLogic::updateStatus($params); + if (true === $result) { + return $this->success('修改成功', [], 1, 1); + } + return $this->fail(ArticleLogic::getError()); + } + + +} \ No newline at end of file diff --git a/app/oa/controller/works/rlzy/OaAdminController.php b/app/oa/controller/works/hr/OaAdminController.php similarity index 98% rename from app/oa/controller/works/rlzy/OaAdminController.php rename to app/oa/controller/works/hr/OaAdminController.php index 6dfecdf..defee5e 100644 --- a/app/oa/controller/works/rlzy/OaAdminController.php +++ b/app/oa/controller/works/hr/OaAdminController.php @@ -25,7 +25,7 @@ use app\adminapi\validate\works\rlzy\OaAdminValidate; /** * 企业员工控制器 * Class OaAdminController - * @package app\adminapi\controller\works\rlzy + * @package app\adminapi\controller\works\hr */ class OaAdminController extends BaseAdminController { diff --git a/app/oa/controller/works/rlzy/OaDepartmentChangeController.php b/app/oa/controller/works/hr/OaDepartmentChangeController.php similarity index 89% rename from app/oa/controller/works/rlzy/OaDepartmentChangeController.php rename to app/oa/controller/works/hr/OaDepartmentChangeController.php index 12fa6b3..9e72619 100644 --- a/app/oa/controller/works/rlzy/OaDepartmentChangeController.php +++ b/app/oa/controller/works/hr/OaDepartmentChangeController.php @@ -12,20 +12,18 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- +namespace app\oa\controller\works\hr; -namespace app\adminapi\controller\works\rlzy; - - -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rlzy\OaDepartmentChangeLists; -use app\adminapi\logic\works\rlzy\OaDepartmentChangeLogic; -use app\adminapi\validate\works\rlzy\OaDepartmentChangeValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\hr\OaDepartmentChangeLists; +use app\oa\logic\works\hr\OaDepartmentChangeLogic; +use app\oa\validate\works\hr\OaDepartmentChangeValidate; /** * 人事调动控制器 * Class OaDepartmentChangeController - * @package app\adminapi\controller\works\rlzy + * @package app\adminapi\controller\works\hr */ class OaDepartmentChangeController extends BaseAdminController { diff --git a/app/oa/controller/works/rlzy/OaPersonalQuitController.php b/app/oa/controller/works/hr/OaPersonalQuitController.php similarity index 90% rename from app/oa/controller/works/rlzy/OaPersonalQuitController.php rename to app/oa/controller/works/hr/OaPersonalQuitController.php index 3b4408b..7d498af 100644 --- a/app/oa/controller/works/rlzy/OaPersonalQuitController.php +++ b/app/oa/controller/works/hr/OaPersonalQuitController.php @@ -13,19 +13,19 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rlzy; +namespace app\oa\controller\works\hr; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rlzy\OaPersonalQuitLists; -use app\adminapi\logic\works\rlzy\OaPersonalQuitLogic; -use app\adminapi\validate\works\rlzy\OaPersonalQuitValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\hr\OaPersonalQuitLists; +use app\oa\logic\works\hr\OaPersonalQuitLogic; +use app\oa\validate\works\hr\OaPersonalQuitValidate; /** * 离职档案控制器 * Class OaPersonalQuitController - * @package app\adminapi\controller\works\rlzy + * @package app\adminapi\controller\works\hr */ class OaPersonalQuitController extends BaseAdminController { diff --git a/app/oa/controller/works/rcbg/OaPlanController.php b/app/oa/controller/works/rcbg/OaPlanController.php index 64cc42f..640a79e 100644 --- a/app/oa/controller/works/rcbg/OaPlanController.php +++ b/app/oa/controller/works/rcbg/OaPlanController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rcbg; +namespace app\oa\controller\works\rcbg; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rcbg\OaPlanLists; -use app\adminapi\logic\works\rcbg\OaPlanLogic; -use app\adminapi\validate\works\rcbg\OaPlanValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\rcbg\OaPlanLists; +use app\oa\logic\works\rcbg\OaPlanLogic; +use app\oa\validate\works\rcbg\OaPlanValidate; /** diff --git a/app/oa/controller/works/rcbg/OaScheduleController.php b/app/oa/controller/works/rcbg/OaScheduleController.php index 1b6ffba..fe7ff57 100644 --- a/app/oa/controller/works/rcbg/OaScheduleController.php +++ b/app/oa/controller/works/rcbg/OaScheduleController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rcbg; +namespace app\oa\controller\works\rcbg; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rcbg\OaScheduleLists; -use app\adminapi\logic\works\rcbg\OaScheduleLogic; -use app\adminapi\validate\works\rcbg\OaScheduleValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\rcbg\OaScheduleLists; +use app\oa\logic\works\rcbg\OaScheduleLogic; +use app\oa\validate\works\rcbg\OaScheduleValidate; /** diff --git a/app/oa/controller/works/rcbg/OaWorkCommentController.php b/app/oa/controller/works/rcbg/OaWorkCommentController.php index ac9f71c..ba11223 100644 --- a/app/oa/controller/works/rcbg/OaWorkCommentController.php +++ b/app/oa/controller/works/rcbg/OaWorkCommentController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rcbg; +namespace app\oa\controller\works\rcbg; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rcbg\OaWorkCommentLists; -use app\adminapi\logic\works\rcbg\OaWorkCommentLogic; -use app\adminapi\validate\works\rcbg\OaWorkCommentValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\rcbg\OaWorkCommentLists; +use app\oa\logic\works\rcbg\OaWorkCommentLogic; +use app\oa\validate\works\rcbg\OaWorkCommentValidate; /** diff --git a/app/oa/controller/works/rcbg/OaWorkController.php b/app/oa/controller/works/rcbg/OaWorkController.php index 5e94cee..24bc00e 100644 --- a/app/oa/controller/works/rcbg/OaWorkController.php +++ b/app/oa/controller/works/rcbg/OaWorkController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rcbg; +namespace app\oa\controller\works\rcbg; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rcbg\OaWorkLists; -use app\adminapi\logic\works\rcbg\OaWorkLogic; -use app\adminapi\validate\works\rcbg\OaWorkValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\rcbg\OaWorkLists; +use app\oa\logic\works\rcbg\OaWorkLogic; +use app\oa\validate\works\rcbg\OaWorkValidate; /** diff --git a/app/oa/controller/works/rcbg/OaWorkRecordController.php b/app/oa/controller/works/rcbg/OaWorkRecordController.php index 6b66bf8..302f586 100644 --- a/app/oa/controller/works/rcbg/OaWorkRecordController.php +++ b/app/oa/controller/works/rcbg/OaWorkRecordController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\rcbg; +namespace app\oa\controller\works\rcbg; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\rcbg\OaWorkRecordLists; -use app\adminapi\logic\works\rcbg\OaWorkRecordLogic; -use app\adminapi\validate\works\rcbg\OaWorkRecordValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\rcbg\OaWorkRecordLists; +use app\oa\logic\works\rcbg\OaWorkRecordLogic; +use app\oa\validate\works\rcbg\OaWorkRecordValidate; /** diff --git a/app/oa/http/middleware/InitMiddleware.php b/app/oa/http/middleware/InitMiddleware.php index 25af0db..b5aa9a7 100644 --- a/app/oa/http/middleware/InitMiddleware.php +++ b/app/oa/http/middleware/InitMiddleware.php @@ -13,11 +13,10 @@ // +---------------------------------------------------------------------- declare (strict_types=1); -namespace app\api\http\middleware; - +namespace app\oa\http\middleware; use app\common\exception\ControllerExtendException; -use app\api\controller\BaseApiController; +use app\oa\controller\BaseAdminController; use think\exception\ClassNotFoundException; use app\common\exception\HttpException; use Webman\Http\Request; @@ -33,7 +32,7 @@ class InitMiddleware implements MiddlewareInterface try { $controller = str_replace('.', '\\', $request->controller); $controllerClass = new $controller; - if (($controllerClass instanceof BaseApiController) === false) { + if (($controllerClass instanceof BaseAdminController) === false) { throw new ControllerExtendException($controller, '404'); } } catch (ClassNotFoundException $e) { diff --git a/app/oa/http/middleware/LoginMiddleware.php b/app/oa/http/middleware/LoginMiddleware.php index 433947f..b7109f6 100644 --- a/app/oa/http/middleware/LoginMiddleware.php +++ b/app/oa/http/middleware/LoginMiddleware.php @@ -1,10 +1,12 @@ header('token'); +// $controller = str_replace('.', '\\', $request->controller); //判断接口是否免登录 $isNotNeedLogin = $request->controllerObject->isNotNeedLogin(); //不直接判断$isNotNeedLogin结果，使不需要登录的接口通过，为了兼容某些接口可以登录或不登录访问 if (empty($token) && !$isNotNeedLogin) { - //没有token并且该地址需要登录才能访问, 指定show为0，前端不弹出此报错 - return JsonService::fail('请求参数缺token', [], 0, 1); + //没有token并且该地址需要登录才能访问 + return JsonService::fail('请求参数缺token', [], 0, 0); } - $userInfo = (new UserTokenCache())->getUserInfo($token); - - if (empty($userInfo) && !$isNotNeedLogin) { + $adminInfo = (new AdminTokenCache())->getAdminInfo($token); + if (empty($adminInfo) && !$isNotNeedLogin) { //token过期无效并且该地址需要登录才能访问 - return JsonService::fail('登录超时，请重新登录', [], -1, 0); + return JsonService::fail('登录超时，请重新登录', [], -1); } + //token临近过期，自动续期 - if ($userInfo) { + if ($adminInfo) { //获取临近过期自动续期时长 - $beExpireDuration = Config::get('project.user_token.be_expire_duration'); + $beExpireDuration = Config::get('project.admin_token.be_expire_duration'); //token续期 - if (time() > ($userInfo['expire_time'] - $beExpireDuration)) { - $result = UserTokenService::overtimeToken($token); + if (time() > ($adminInfo['expire_time'] - $beExpireDuration)) { + $result = AdminTokenService::overtimeToken($token); //续期失败（数据表被删除导致） if (empty($result)) { return JsonService::fail('登录过期', [], -1); @@ -53,10 +56,10 @@ class LoginMiddleware implements MiddlewareInterface } //给request赋值，用于控制器 - $request->userInfo = $userInfo; - $request->userId = $userInfo['user_id'] ?? 0; + $request->adminInfo = $adminInfo; + $request->adminId = $adminInfo['admin_id'] ?? 0; + $request->supplierId = $adminInfo['supplier_id'] ?? 0; return $handler($request); } - } \ No newline at end of file diff --git a/app/oa/lists/article/ArticleCateLists.php b/app/oa/lists/article/ArticleCateLists.php new file mode 100644 index 0000000..c6969f7 --- /dev/null +++ b/app/oa/lists/article/ArticleCateLists.php @@ -0,0 +1,98 @@ + 'create_time', 'id' => 'id']; + } + + /** + * @notes 设置默认排序 + * @return array + * @author heshihu + * @date 2022/2/9 15:08 + */ + public function setDefaultOrder(): array + { + return ['sort' => 'desc','id' => 'desc']; + } + + /** + * @notes 获取管理列表 + * @return array + * @author heshihu + * @date 2022/2/21 17:11 + */ + public function lists(): array + { + $ArticleCateLists = ArticleCate::where($this->searchWhere) + ->append(['is_show_desc']) + ->limit($this->limitOffset, $this->limitLength) + ->order($this->sortOrder) + ->append(['article_count']) + ->select() + ->toArray(); + + return $ArticleCateLists; + } + + /** + * @notes 获取数量 + * @return int + * @author heshihu + * @date 2022/2/9 15:12 + */ + public function count(): int + { + return ArticleCate::where($this->searchWhere)->count(); + } + + public function extend() + { + return []; + } +} \ No newline at end of file diff --git a/app/oa/lists/article/ArticleLists.php b/app/oa/lists/article/ArticleLists.php new file mode 100644 index 0000000..79a77a0 --- /dev/null +++ b/app/oa/lists/article/ArticleLists.php @@ -0,0 +1,99 @@ + ['title'], + '=' => ['cid', 'is_show'] + ]; + } + + /** + * @notes 设置支持排序字段 + * @return array + * @author heshihu + * @date 2022/2/9 15:11 + */ + public function setSortFields(): array + { + return ['create_time' => 'create_time', 'id' => 'id']; + } + + /** + * @notes 设置默认排序 + * @return array + * @author heshihu + * @date 2022/2/9 15:08 + */ + public function setDefaultOrder(): array + { + return ['sort' => 'desc', 'id' => 'desc']; + } + + /** + * @notes 获取管理列表 + * @return array + * @author heshihu + * @date 2022/2/21 17:11 + */ + public function lists(): array + { + $ArticleLists = Article::where($this->searchWhere) + ->append(['cate_name', 'click']) + ->limit($this->limitOffset, $this->limitLength) + ->order($this->sortOrder) + ->select() + ->toArray(); + + return $ArticleLists; + } + + /** + * @notes 获取数量 + * @return int + * @author heshihu + * @date 2022/2/9 15:12 + */ + public function count(): int + { + return Article::where($this->searchWhere)->count(); + } + + public function extend() + { + return []; + } +} \ No newline at end of file diff --git a/app/oa/lists/works/rlzy/OaAdminLists.php b/app/oa/lists/works/hr/OaAdminLists.php similarity index 95% rename from app/oa/lists/works/rlzy/OaAdminLists.php rename to app/oa/lists/works/hr/OaAdminLists.php index 2be22e9..203a89d 100644 --- a/app/oa/lists/works/rlzy/OaAdminLists.php +++ b/app/oa/lists/works/hr/OaAdminLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rlzy; +namespace app\oa\lists\works\hr; -use app\adminapi\lists\BaseAdminDataLists; +use app\oa\lists\BaseAdminDataLists; use app\common\model\dept\Dept; use app\common\model\dept\Jobs; use app\common\model\dept\Orgs; @@ -26,7 +26,7 @@ use app\common\lists\ListsSearchInterface; /** * 企业员工列表 * Class OaAdminLists - * @package app\adminapi\listsworks\rlzy + * @package app\adminapi\listsworks\hr */ class OaAdminLists extends BaseAdminDataLists implements ListsSearchInterface { diff --git a/app/oa/lists/works/rlzy/OaDepartmentChangeLists.php b/app/oa/lists/works/hr/OaDepartmentChangeLists.php similarity index 95% rename from app/oa/lists/works/rlzy/OaDepartmentChangeLists.php rename to app/oa/lists/works/hr/OaDepartmentChangeLists.php index 39af0a3..e6e920c 100644 --- a/app/oa/lists/works/rlzy/OaDepartmentChangeLists.php +++ b/app/oa/lists/works/hr/OaDepartmentChangeLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rlzy; +namespace app\oa\lists\works\hr; -use app\adminapi\lists\BaseAdminDataLists; +use app\oa\lists\BaseAdminDataLists; use app\common\model\works\rlzy\OaDepartmentChange; use app\common\lists\ListsSearchInterface; @@ -23,7 +23,7 @@ use app\common\lists\ListsSearchInterface; /** * 人事调动列表 * Class OaDepartmentChangeLists - * @package app\adminapi\listsworks\rlzy + * @package app\adminapi\listsworks\hr */ class OaDepartmentChangeLists extends BaseAdminDataLists implements ListsSearchInterface { diff --git a/app/oa/lists/works/rlzy/OaPersonalQuitLists.php b/app/oa/lists/works/hr/OaPersonalQuitLists.php similarity index 95% rename from app/oa/lists/works/rlzy/OaPersonalQuitLists.php rename to app/oa/lists/works/hr/OaPersonalQuitLists.php index 5c2222d..4d71636 100644 --- a/app/oa/lists/works/rlzy/OaPersonalQuitLists.php +++ b/app/oa/lists/works/hr/OaPersonalQuitLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rlzy; +namespace app\oa\lists\works\hr; -use app\adminapi\lists\BaseAdminDataLists; +use app\oa\lists\BaseAdminDataLists; use app\common\model\auth\Admin; use app\common\model\works\rlzy\OaPersonalQuit; use app\common\lists\ListsSearchInterface; @@ -24,7 +24,7 @@ use app\common\lists\ListsSearchInterface; /** * 离职档案列表 * Class OaPersonalQuitLists - * @package app\adminapi\listsworks\rlzy + * @package app\adminapi\listsworks\hr */ class OaPersonalQuitLists extends BaseAdminDataLists implements ListsSearchInterface { diff --git a/app/oa/lists/works/rcbg/OaPlanLists.php b/app/oa/lists/works/rcbg/OaPlanLists.php index d5b8d25..8625d5b 100644 --- a/app/oa/lists/works/rcbg/OaPlanLists.php +++ b/app/oa/lists/works/rcbg/OaPlanLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rcbg; +namespace app\oa\lists\works\rcbg; -use app\adminapi\lists\BaseAdminDataLists; +use app\admin\lists\BaseAdminDataLists; use app\common\model\works\rcbg\OaPlan; use app\common\lists\ListsSearchInterface; diff --git a/app/oa/lists/works/rcbg/OaScheduleLists.php b/app/oa/lists/works/rcbg/OaScheduleLists.php index 80f2500..212f051 100644 --- a/app/oa/lists/works/rcbg/OaScheduleLists.php +++ b/app/oa/lists/works/rcbg/OaScheduleLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rcbg; +namespace app\oa\lists\works\rcbg; -use app\adminapi\lists\BaseAdminDataLists; +use app\admin\lists\BaseAdminDataLists; use app\common\model\works\rcbg\OaSchedule; use app\common\lists\ListsSearchInterface; diff --git a/app/oa/lists/works/rcbg/OaWorkCommentLists.php b/app/oa/lists/works/rcbg/OaWorkCommentLists.php index e374ddc..dcec593 100644 --- a/app/oa/lists/works/rcbg/OaWorkCommentLists.php +++ b/app/oa/lists/works/rcbg/OaWorkCommentLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rcbg; +namespace app\oa\lists\works\rcbg; -use app\adminapi\lists\BaseAdminDataLists; +use app\admin\lists\BaseAdminDataLists; use app\common\model\auth\Admin; use app\common\model\works\rcbg\OaWorkComment; use app\common\lists\ListsSearchInterface; diff --git a/app/oa/lists/works/rcbg/OaWorkLists.php b/app/oa/lists/works/rcbg/OaWorkLists.php index 5a9a955..1e8bdb1 100644 --- a/app/oa/lists/works/rcbg/OaWorkLists.php +++ b/app/oa/lists/works/rcbg/OaWorkLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rcbg; +namespace app\oa\lists\works\rcbg; -use app\adminapi\lists\BaseAdminDataLists; +use app\admin\lists\BaseAdminDataLists; use app\common\model\auth\Admin; use app\common\model\works\rcbg\OaWork; use app\common\lists\ListsSearchInterface; diff --git a/app/oa/lists/works/rcbg/OaWorkRecordLists.php b/app/oa/lists/works/rcbg/OaWorkRecordLists.php index 153edae..23b8693 100644 --- a/app/oa/lists/works/rcbg/OaWorkRecordLists.php +++ b/app/oa/lists/works/rcbg/OaWorkRecordLists.php @@ -12,10 +12,10 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\adminapi\lists\works\rcbg; +namespace app\oa\lists\works\rcbg; -use app\adminapi\lists\BaseAdminDataLists; +use app\admin\lists\BaseAdminDataLists; use app\common\model\auth\Admin; use app\common\model\works\rcbg\OaWork; use app\common\model\works\rcbg\OaWorkRecord; diff --git a/app/oa/logic/article/ArticleCateLogic.php b/app/oa/logic/article/ArticleCateLogic.php new file mode 100644 index 0000000..4e8ab70 --- /dev/null +++ b/app/oa/logic/article/ArticleCateLogic.php @@ -0,0 +1,127 @@ + $params['name'], + 'is_show' => $params['is_show'], + 'sort' => $params['sort'] ?? 0 + ]); + } + + + /** + * @notes 编辑资讯分类 + * @param array $params + * @return bool + * @author heshihu + * @date 2022/2/21 17:50 + */ + public static function edit(array $params) : bool + { + try { + ArticleCate::update([ + 'id' => $params['id'], + 'name' => $params['name'], + 'is_show' => $params['is_show'], + 'sort' => $params['sort'] ?? 0 + ]); + return true; + } catch (\Exception $e) { + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除资讯分类 + * @param array $params + * @author heshihu + * @date 2022/2/21 17:52 + */ + public static function delete(array $params) + { + ArticleCate::destroy($params['id']); + } + + /** + * @notes 查看资讯分类详情 + * @param $params + * @return array + * @author heshihu + * @date 2022/2/21 17:54 + */ + public static function detail($params) : array + { + return ArticleCate::findOrEmpty($params['id'])->toArray(); + } + + /** + * @notes 更改资讯分类状态 + * @param array $params + * @return bool + * @author heshihu + * @date 2022/2/21 18:04 + */ + public static function updateStatus(array $params) + { + ArticleCate::update([ + 'id' => $params['id'], + 'is_show' => $params['is_show'] + ]); + return true; + } + + + /** + * @notes 文章分类数据 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/10/13 10:53 + */ + public static function getAllData() + { + return ArticleCate::where(['is_show' => YesNoEnum::YES]) + ->order(['sort' => 'desc', 'id' => 'desc']) + ->select() + ->toArray(); + } + +} \ No newline at end of file diff --git a/app/oa/logic/article/ArticleLogic.php b/app/oa/logic/article/ArticleLogic.php new file mode 100644 index 0000000..2a450ce --- /dev/null +++ b/app/oa/logic/article/ArticleLogic.php @@ -0,0 +1,121 @@ + $params['title'], + 'desc' => $params['desc'] ?? '', + 'author' => $params['author'] ?? '', //作者 + 'sort' => $params['sort'] ?? 0, // 排序 + 'abstract' => $params['abstract'], // 文章摘要 + 'click_virtual' => $params['click_virtual'] ?? 0, + 'image' => $params['image'] ? FileService::setFileUrl($params['image']) : '', + 'cid' => $params['cid'], + 'is_show' => $params['is_show'], + 'content' => $params['content'] ?? '', + ]); + } + + + /** + * @notes 编辑资讯 + * @param array $params + * @return bool + * @author heshihu + * @date 2022/2/22 10:12 + */ + public static function edit(array $params) : bool + { + try { + Article::update([ + 'id' => $params['id'], + 'title' => $params['title'], + 'desc' => $params['desc'] ?? '', // 简介 + 'author' => $params['author'] ?? '', //作者 + 'sort' => $params['sort'] ?? 0, // 排序 + 'abstract' => $params['abstract'], // 文章摘要 + 'click_virtual' => $params['click_virtual'] ?? 0, + 'image' => $params['image'] ? FileService::setFileUrl($params['image']) : '', + 'cid' => $params['cid'], + 'is_show' => $params['is_show'], + 'content' => $params['content'] ?? '', + ]); + return true; + } catch (\Exception $e) { + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除资讯 + * @param array $params + * @author heshihu + * @date 2022/2/22 10:17 + */ + public static function delete(array $params) + { + Article::destroy($params['id']); + } + + /** + * @notes 查看资讯详情 + * @param $params + * @return array + * @author heshihu + * @date 2022/2/22 10:15 + */ + public static function detail($params) : array + { + return Article::findOrEmpty($params['id'])->toArray(); + } + + /** + * @notes 更改资讯状态 + * @param array $params + * @return bool + * @author heshihu + * @date 2022/2/22 10:18 + */ + public static function updateStatus(array $params) + { + Article::update([ + 'id' => $params['id'], + 'is_show' => $params['is_show'] + ]); + return true; + } +} \ No newline at end of file diff --git a/app/oa/logic/works/rlzy/OaAdminLogic.php b/app/oa/logic/works/hr/OaAdminLogic.php similarity index 99% rename from app/oa/logic/works/rlzy/OaAdminLogic.php rename to app/oa/logic/works/hr/OaAdminLogic.php index 84085b8..1f685f9 100644 --- a/app/oa/logic/works/rlzy/OaAdminLogic.php +++ b/app/oa/logic/works/hr/OaAdminLogic.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\logic\works\rlzy; +namespace app\oa\logic\works\hr; use app\common\cache\AdminAuthCache; @@ -32,7 +32,7 @@ use think\facade\Db; /** * 企业员工逻辑 * Class OaAdminLogic - * @package app\adminapi\logic\works\rlzy + * @package app\adminapi\logic\works\hr */ class OaAdminLogic extends BaseLogic { diff --git a/app/oa/logic/works/rlzy/OaDepartmentChangeLogic.php b/app/oa/logic/works/hr/OaDepartmentChangeLogic.php similarity index 97% rename from app/oa/logic/works/rlzy/OaDepartmentChangeLogic.php rename to app/oa/logic/works/hr/OaDepartmentChangeLogic.php index ae75dfc..341bcbb 100644 --- a/app/oa/logic/works/rlzy/OaDepartmentChangeLogic.php +++ b/app/oa/logic/works/hr/OaDepartmentChangeLogic.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\logic\works\rlzy; +namespace app\oa\logic\works\hr; use app\common\model\auth\Admin; @@ -24,7 +24,7 @@ use think\facade\Db; /** * 人事调动逻辑 * Class OaDepartmentChangeLogic - * @package app\adminapi\logic\works\rlzy + * @package app\adminapi\logic\works\hr */ class OaDepartmentChangeLogic extends BaseLogic { diff --git a/app/oa/logic/works/rlzy/OaPersonalQuitLogic.php b/app/oa/logic/works/hr/OaPersonalQuitLogic.php similarity index 98% rename from app/oa/logic/works/rlzy/OaPersonalQuitLogic.php rename to app/oa/logic/works/hr/OaPersonalQuitLogic.php index dc1666b..3ae9fd6 100644 --- a/app/oa/logic/works/rlzy/OaPersonalQuitLogic.php +++ b/app/oa/logic/works/hr/OaPersonalQuitLogic.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\logic\works\rlzy; +namespace app\oa\logic\works\hr; use app\common\model\auth\Admin; @@ -24,7 +24,7 @@ use think\facade\Db; /** * 离职档案逻辑 * Class OaPersonalQuitLogic - * @package app\adminapi\logic\works\rlzy + * @package app\adminapi\logic\works\hr */ class OaPersonalQuitLogic extends BaseLogic { diff --git a/app/oa/validate/article/ArticleCateValidate.php b/app/oa/validate/article/ArticleCateValidate.php new file mode 100644 index 0000000..376d7c9 --- /dev/null +++ b/app/oa/validate/article/ArticleCateValidate.php @@ -0,0 +1,136 @@ + 'require|checkArticleCate', + 'name' => 'require|length:1,90', + 'is_show' => 'require|in:0,1', + 'sort' => 'egt:0', + ]; + + protected $message = [ + 'id.require' => '资讯分类id不能为空', + 'name.require' => '资讯分类不能为空', + 'name.length' => '资讯分类长度须在1-90位字符', + 'sort.egt' => '排序值不正确', + ]; + + /** + * @notes 添加场景 + * @return ArticleCateValidate + * @author heshihu + * @date 2022/2/10 15:11 + */ + public function sceneAdd() + { + return $this->remove(['id']) + ->remove('id', 'require|checkArticleCate'); + } + + /** + * @notes 详情场景 + * @return ArticleCateValidate + * @author heshihu + * @date 2022/2/21 17:55 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + /** + * @notes 更改状态场景 + * @return ArticleCateValidate + * @author heshihu + * @date 2022/2/21 18:02 + */ + public function sceneStatus() + { + return $this->only(['id', 'is_show']); + } + + public function sceneEdit() + { + } + + /** + * @notes 获取所有资讯分类场景 + * @return ArticleCateValidate + * @author heshihu + * @date 2022/2/15 10:05 + */ + public function sceneSelect() + { + return $this->only(['type']); + } + + + /** + * @notes 删除场景 + * @return ArticleCateValidate + * @author heshihu + * @date 2022/2/21 17:52 + */ + public function sceneDelete() + { + return $this->only(['id']) + ->append('id', 'checkDeleteArticleCate'); + } + + /** + * @notes 检查指定资讯分类是否存在 + * @param $value + * @return bool|string + * @author heshihu + * @date 2022/2/10 15:10 + */ + public function checkArticleCate($value) + { + $article_category = ArticleCate::findOrEmpty($value); + if ($article_category->isEmpty()) { + return '资讯分类不存在'; + } + return true; + } + + /** + * @notes 删除时验证该资讯分类是否已使用 + * @param $value + * @return bool|string + * @author heshihu + * @date 2022/2/22 14:45 + */ + public function checkDeleteArticleCate($value) + { + $article = Article::where('cid', $value)->findOrEmpty(); + if (!$article->isEmpty()) { + return '资讯分类已使用，请先删除绑定该资讯分类的资讯'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/oa/validate/article/ArticleValidate.php b/app/oa/validate/article/ArticleValidate.php new file mode 100644 index 0000000..f2c364c --- /dev/null +++ b/app/oa/validate/article/ArticleValidate.php @@ -0,0 +1,108 @@ + 'require|checkArticle', + 'title' => 'require|length:1,255', +// 'image' => 'require', + 'cid' => 'require', + 'is_show' => 'require|in:0,1', + ]; + + protected $message = [ + 'id.require' => '资讯id不能为空', + 'title.require' => '标题不能为空', + 'title.length' => '标题长度须在1-255位字符', +// 'image.require' => '封面图必须存在', + 'cid.require' => '所属栏目必须存在', + ]; + + /** + * @notes 添加场景 + * @return ArticleValidate + * @author heshihu + * @date 2022/2/22 9:57 + */ + public function sceneAdd() + { + return $this->remove(['id']) + ->remove('id', 'require|checkArticle'); + } + + /** + * @notes 详情场景 + * @return ArticleValidate + * @author heshihu + * @date 2022/2/22 10:15 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + /** + * @notes 更改状态场景 + * @return ArticleValidate + * @author heshihu + * @date 2022/2/22 10:18 + */ + public function sceneStatus() + { + return $this->only(['id', 'is_show']); + } + + public function sceneEdit() + { + } + + /** + * @notes 删除场景 + * @return ArticleValidate + * @author heshihu + * @date 2022/2/22 10:17 + */ + public function sceneDelete() + { + return $this->only(['id'])->remove('id', 'checkData'); + } + + /** + * @notes 检查指定资讯是否存在 + * @param $value + * @return bool|string + * @author heshihu + * @date 2022/2/22 10:11 + */ + public function checkArticle($value) + { + $article = Article::findOrEmpty($value); + if ($article->isEmpty()) { + return '资讯不存在'; + } + return true; + } + + } \ No newline at end of file diff --git a/app/oa/validate/works/rlzy/OaAdminValidate.php b/app/oa/validate/works/hr/OaAdminValidate.php similarity index 98% rename from app/oa/validate/works/rlzy/OaAdminValidate.php rename to app/oa/validate/works/hr/OaAdminValidate.php index f9fb017..abe326f 100644 --- a/app/oa/validate/works/rlzy/OaAdminValidate.php +++ b/app/oa/validate/works/hr/OaAdminValidate.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\validate\works\rlzy; +namespace app\oa\validate\works\hr; use app\common\model\auth\SystemRole; @@ -26,7 +26,7 @@ use app\common\validate\BaseValidate; /** * 企业员工验证器 * Class OaAdminValidate - * @package app\adminapi\validate\works\rlzy + * @package app\adminapi\validate\works\hr */ class OaAdminValidate extends BaseValidate { diff --git a/app/oa/validate/works/rlzy/OaDepartmentChangeValidate.php b/app/oa/validate/works/hr/OaDepartmentChangeValidate.php similarity index 97% rename from app/oa/validate/works/rlzy/OaDepartmentChangeValidate.php rename to app/oa/validate/works/hr/OaDepartmentChangeValidate.php index d38ea11..35a38a5 100644 --- a/app/oa/validate/works/rlzy/OaDepartmentChangeValidate.php +++ b/app/oa/validate/works/hr/OaDepartmentChangeValidate.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\validate\works\rlzy; +namespace app\oa\validate\works\hr; use app\common\model\works\rlzy\OaDepartmentChange; @@ -22,7 +22,7 @@ use app\common\validate\BaseValidate; /** * 人事调动验证器 * Class OaDepartmentChangeValidate - * @package app\adminapi\validate\works\rlzy + * @package app\adminapi\validate\works\hr */ class OaDepartmentChangeValidate extends BaseValidate { diff --git a/app/oa/validate/works/rlzy/OaPersonalQuitValidate.php b/app/oa/validate/works/hr/OaPersonalQuitValidate.php similarity index 97% rename from app/oa/validate/works/rlzy/OaPersonalQuitValidate.php rename to app/oa/validate/works/hr/OaPersonalQuitValidate.php index 48eb611..e2f3e85 100644 --- a/app/oa/validate/works/rlzy/OaPersonalQuitValidate.php +++ b/app/oa/validate/works/hr/OaPersonalQuitValidate.php @@ -12,7 +12,7 @@ // | author: likeadminTeam // +---------------------------------------------------------------------- -namespace app\oa\validate\works\rlzy; +namespace app\oa\validate\works\hr; use app\common\model\works\rlzy\OaPersonalQuit; @@ -22,7 +22,7 @@ use app\common\validate\BaseValidate; /** * 离职档案验证器 * Class OaPersonalQuitValidate - * @package app\adminapi\validate\works\rlzy + * @package app\adminapi\validate\works\hr */ class OaPersonalQuitValidate extends BaseValidate { diff --git a/config/middleware.php b/config/middleware.php index c757c87..8c5ae07 100644 --- a/config/middleware.php +++ b/config/middleware.php @@ -35,4 +35,16 @@ return [ app\api\http\middleware\LoginMiddleware::class, ], + 'oa' => [ + // 跨域中间件 + app\common\http\middleware\AdminAllowMiddleware::class, + // 初始化 + app\admin\middleware\InitMiddleware::class, + // 登录验证 + app\admin\middleware\LoginMiddleware::class, + // 权限认证 + app\admin\middleware\AuthMiddleware::class, + // 操作日志记录 + app\admin\middleware\OperationLogMiddleware::class, + ], ];