正在显示
3 个修改的文件
包含
5 行增加
和
7 行删除
| @@ -496,6 +496,9 @@ class ProjectController extends BaseController | @@ -496,6 +496,9 @@ class ProjectController extends BaseController | ||
| 496 | public function getManagerList(){ | 496 | public function getManagerList(){ |
| 497 | $hrManagerModel = new ManageHr(); | 497 | $hrManagerModel = new ManageHr(); |
| 498 | $this->map['status'] = $hrManagerModel::STATUS_ONE; | 498 | $this->map['status'] = $hrManagerModel::STATUS_ONE; |
| 499 | + if(isset($this->map['entry_position']) && in_array($this->param['entry_position'])){ | ||
| 500 | + | ||
| 501 | + } | ||
| 499 | $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']); | 502 | $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']); |
| 500 | $this->response('success',Code::SUCCESS,$lists); | 503 | $this->response('success',Code::SUCCESS,$lists); |
| 501 | } | 504 | } |
| @@ -71,8 +71,8 @@ class BTemplateController extends BaseController | @@ -71,8 +71,8 @@ class BTemplateController extends BaseController | ||
| 71 | * @time :2023/6/29 10:02 | 71 | * @time :2023/6/29 10:02 |
| 72 | */ | 72 | */ |
| 73 | public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){ | 73 | public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){ |
| 74 | - //演示项目,不允许其他号码编辑 | ||
| 75 | - if(($this->user['project_id'] == 1) && ($this->user['mobile'] != '15928018676' || $this->user['mobile'] != '15680871314') && ($this->param['source'] == 1)){ | 74 | + //演示项目,不允许其他号码编辑$this->user['mobile'] != '15928018676' || |
| 75 | + if(($this->user['project_id'] == 1) && ($this->user['mobile'] != '15680871314') && ($this->param['source'] == 1)){ | ||
| 76 | $this->response('演示项目仅支持演示功能,无法更改首页',Code::USER_ERROR); | 76 | $this->response('演示项目仅支持演示功能,无法更改首页',Code::USER_ERROR); |
| 77 | } | 77 | } |
| 78 | $templateRequest->validated(); | 78 | $templateRequest->validated(); |
| @@ -47,11 +47,6 @@ class ManageLogic extends BaseLogic | @@ -47,11 +47,6 @@ class ManageLogic extends BaseLogic | ||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | - public function getCacheName($id){ | ||
| 51 | - $info = $this->model->read(['id'=>$id]); | ||
| 52 | - return $info['name'] ?? ''; | ||
| 53 | - } | ||
| 54 | - | ||
| 55 | /** | 50 | /** |
| 56 | * @remark :设置排序 | 51 | * @remark :设置排序 |
| 57 | * @name :setSort | 52 | * @name :setSort |
-
请 注册 或 登录 后发表评论