From f41fdebb8f553cf108886d808ec159f68d1aae99 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Mon, 26 Aug 2019 08:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=AF=BC=E5=85=A5=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/DepartmentMember.php | 2 ++
 application/project/controller/Account.php    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/common/Model/DepartmentMember.php b/application/common/Model/DepartmentMember.php
index c5e0656..99fdc33 100644
--- a/application/common/Model/DepartmentMember.php
+++ b/application/common/Model/DepartmentMember.php
@@ -172,6 +172,8 @@ class DepartmentMember extends CommonModel
                                 }
                             }
                         }
+                    } else {
+                        $this->inviteMember($memberAccount['code'], '');
                     }
                 }
 
diff --git a/application/project/controller/Account.php b/application/project/controller/Account.php
index 1a314fa..0cefcf1 100644
--- a/application/project/controller/Account.php
+++ b/application/project/controller/Account.php
@@ -71,7 +71,7 @@ class Account extends BasicApi
             list($start, $end) = explode('~', $params['date']);
             $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']) {
             foreach ($list['list'] as &$item) {
                 $memberInfo = Member::where(['code' => $item['member_code']])->field('id', true)->find();