mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev

Browse Source
This commit is contained in:
yaooo 2023-10-10 10:35:10 +08:00
commit 1718f49893
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/common/logic/task_template/TaskTemplateLogic.php
View File

@ -251,11 +251,24 @@ class TaskTemplateLogic extends BaseLogic
try { try {
Db::startTrans(); Db::startTrans();
// $params['extend']['task_role'] 扩展字段 任务角色 1总负责人 2市场部长 3服务部长
if ($params['extend']['task_role'] == 2) {
$serviceManagerUser = (new User())->searchMarketingManager($params['company_id']);
if (empty($serviceManagerUser)) {
self::setError('公司还没有市场部长，无法指派任务');
return false;
}
}
if ($params['extend']['task_role'] == 3) {
$serviceManagerUser = (new User())->searchServiceManager($params['company_id']); $serviceManagerUser = (new User())->searchServiceManager($params['company_id']);
if (empty($serviceManagerUser)) { if (empty($serviceManagerUser)) {
self::setError('公司还没有服务部长，无法指派任务'); self::setError('公司还没有服务部长，无法指派任务');
return false; return false;
} }
}
$find = TaskTemplate::where('task_scheduling', $params['task_scheduling'])->where('company_id',$params['company_id'])->where('type',$params['type'])->field('id,types,type')->find(); $find = TaskTemplate::where('task_scheduling', $params['task_scheduling'])->where('company_id',$params['company_id'])->where('type',$params['type'])->field('id,types,type')->find();
if($find && $params['type'] == $find['type']){ if($find && $params['type'] == $find['type']){
self::setError('已经有同一种任务类型了'); self::setError('已经有同一种任务类型了');

4
app/common/model/user/User.php
View File

@ -225,4 +225,8 @@ class User extends BaseModel
{ {
return User::where(['company_id' => $companyId, 'group_id'=> 14])->find(); return User::where(['company_id' => $companyId, 'group_id'=> 14])->find();
} }
public function searchMarketingManager($companyId)
{
return User::where(['company_id' => $companyId, 'group_id'=> 16])->find();
}
} }