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

修复无法正常导入团队成员的问题

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-08-26 08:07:09 +08:00
parent f83275f47b
commit f41fdebb8f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/Model/DepartmentMember.php
View File

@ -172,6 +172,8 @@ class DepartmentMember extends CommonModel
} }
} }
} }
} else {
$this->inviteMember($memberAccount['code'], '');
} }
} }

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

@ -71,7 +71,7 @@ class Account extends BasicApi
list($start, $end) = explode('~', $params['date']); list($start, $end) = explode('~', $params['date']);
$where[] = ['last_login_time', 'between', ["{$start} 00:00:00", "{$end} 23:59:59"]]; $where[] = ['last_login_time', 'between', ["{$start} 00:00:00", "{$end} 23:59:59"]];
} }
$list = $this->model->_list($where, 'id asc'); $list = $this->model->_list($where, 'id desc');
if ($list['list']) { if ($list['list']) {
foreach ($list['list'] as &$item) { foreach ($list['list'] as &$item) {
$memberInfo = Member::where(['code' => $item['member_code']])->field('id', true)->find(); $memberInfo = Member::where(['code' => $item['member_code']])->field('id', true)->find();