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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
liweisen 2020-05-09 17:57:20 +08:00
commit a8b2f3a92e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/project/controller/Account.php
View File

@ -5,11 +5,16 @@ namespace app\project\controller;
use app\common\Model\Member; use app\common\Model\Member;
use app\common\Model\MemberAccount; use app\common\Model\MemberAccount;
use app\common\Model\Organization; use app\common\Model\Organization;
use app\common\Model\ProjectAuth;
use app\common\Model\SystemConfig; use app\common\Model\SystemConfig;
use controller\BasicApi; use controller\BasicApi;
use Exception;
use service\FileService; use service\FileService;
use service\MessageService; use service\MessageService;
use service\NodeService; use service\NodeService;
use think\db\exception\DataNotFoundException;
use think\db\exception\ModelNotFoundException;
use think\exception\DbException;
use think\facade\Request; use think\facade\Request;
use think\File; use think\File;
@ -31,7 +36,7 @@ class Account extends BasicApi
/** /**
* 账户列表 * 账户列表
* @return array|string * @return array|string
* @throws \think\exception\DbException * @throws DbException
*/ */
public function index() public function index()
{ {
@ -94,7 +99,7 @@ class Account extends BasicApi
} }
unset($item); unset($item);
} }
$list['authList'] = \app\common\Model\ProjectAuth::where(['status' => '1', 'organization_code' => $currentOrganizationCode])->select(); $list['authList'] = ProjectAuth::where(['status' => '1', 'organization_code' => $currentOrganizationCode])->select();
$this->success('', $list); $this->success('', $list);
} }
@ -153,7 +158,7 @@ class Account extends BasicApi
$this->error('该链接已失效'); $this->error('该链接已失效');
} }
if ($inviteLink['invite_type'] == 'organization') { if ($inviteLink['invite_type'] == 'organization') {
$organization = \app\common\Model\Organization::where(['code' => $inviteLink['source_code']])->find(); $organization = Organization::where(['code' => $inviteLink['source_code']])->find();
if (!$organization) { if (!$organization) {
$this->error('该组织不存在'); $this->error('该组织不存在');
} }
@ -178,9 +183,9 @@ class Account extends BasicApi
/** /**
* 更新本团队内的头像和手机、邮箱 * 更新本团队内的头像和手机、邮箱
* @throws \think\db\exception\DataNotFoundException * @throws DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws ModelNotFoundException
* @throws \think\exception\DbException * @throws DbException
*/ */
public function _syncDetail() public function _syncDetail()
{ {
@ -200,9 +205,9 @@ class Account extends BasicApi
/** /**
* 账户添加 * 账户添加
* @return array|string * @return array|string
* @throws \think\db\exception\DataNotFoundException * @throws DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws ModelNotFoundException
* @throws \think\exception\DbException * @throws DbException
*/ */
public function add() public function add()
{ {
@ -251,8 +256,8 @@ class Account extends BasicApi
{ {
try { try {
$result = $this->model->del(Request::post('accountCode')); $result = $this->model->del(Request::post('accountCode'));
} catch (\Exception $e) { } catch (Exception $e) {
$this->error($e->getMessage(), $e->getCode());; $this->error($e->getMessage(), $e->getCode());
} }
if ($result) { if ($result) {
$this->success('', $result); $this->success('', $result);