From 4ffb6e954ba6cad03c8e6be3fee81621b4b91712 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Sat, 24 Feb 2018 00:13:19 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Login.php | 9 ++++++++-
 application/admin/controller/User.php  | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 9d9f074..17003ad 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * 登录登出
  * @since   2017-11-02
  * @author  zhaoxiang <zhaoxiang051405@gmail.com>
  */
@@ -14,6 +15,12 @@ use app\util\Tools;
 
 class Login extends Base {
 
+    /**
+     * 用户登录
+     * @author zhaoxiang <zhaoxiang051405@gmail.com>
+     * @return array
+     * @throws \think\exception\DbException
+     */
     public function index() {
         $username = $this->request->post('username');
         $password = $this->request->post('password');
@@ -73,4 +80,4 @@ class Login extends Base {
         return $this->buildSuccess(ReturnCode::SUCCESS, [], '登出成功');
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index 08835a6..6d4af8f 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -96,7 +96,7 @@ class User extends Base {
         $postData['regTime'] = time();
         $postData['password'] = Tools::userMd5($postData['password']);
         if ($postData['groupId']) {
-            $groups = implode(',', $postData['groupId']);
+            $groups = trim(implode(',', $postData['groupId']), ',');
         }
         unset($postData['groupId']);
         $res = ApiUser::create($postData);
@@ -193,7 +193,7 @@ class User extends Base {
             $postData['password'] = Tools::userMd5($postData['password']);
         }
         if ($postData['groupId']) {
-            $groups = implode(',', $postData['groupId']);
+            $groups = trim(implode(',', $postData['groupId']), ',');
         }
         unset($postData['groupId']);
         $res = ApiUser::update($postData);