github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-07 05:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-06-02 09:30:19 +08:00
parent 777b329181
commit a10e9053f9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/ProjectController.php
View File

@ -220,8 +220,9 @@ class ProjectController extends AbstractController
*/
public function add()
{
User::auth();
return Project::createProject(Request::all());
$user = User::auth();
//
return Project::createProject(Request::all(), $user->userid);
}
/**

2
app/Http/Controllers/Api/UsersController.php
View File

@ -120,7 +120,7 @@ class UsersController extends AbstractController
'name' => Base::Lang('个人项目'),
'desc' => Base::Lang('注册时系统自动创建项目，你可以自由删除。'),
'personal' => 1,
]);
], $user->userid);
}
//
return Base::retSuccess($type == 'reg' ? "注册成功" : "登录成功", $user);

6
app/Models/Project.php
View File

@ -476,7 +476,7 @@ class Project extends AbstractModel
* - columns
* @return array
*/
public static function createProject($params)
public static function createProject($params, $userid)
{
$name = trim(Arr::get($params, 'name', ''));
$desc = trim(Arr::get($params, 'desc', ''));
@ -516,10 +516,10 @@ class Project extends AbstractModel
$project = Project::createInstance([
'name' => $name,
'desc' => $desc,
'userid' => User::userid(),
'userid' => $userid,
]);
if ($isPersonal) {
if (Project::whereUserid(User::userid())->wherePersonal(1)->exists()) {
if (Project::whereUserid($userid)->wherePersonal(1)->exists()) {
return Base::retError('个人项目已存在，无须重复创建');
}
$project->personal = 1;