Merge pull request #1208 from stoneworld/master

Scyllaly · web-flow · commit dbbac8f1689c · 2019-01-02T11:20:10.000+08:00
fixed 批量生成接口 报错
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -310,7 +310,7 @@ public function batchAddUsers(Request $request)
                 $user->save();
 
                 // 初始化默认标签
-                if (count(self::$systemConfig['initial_labels_for_user']) > 0) {
+                if (!empty(self::$systemConfig['initial_labels_for_user'])) {
                     $labels = explode(',', self::$systemConfig['initial_labels_for_user']);
                     $this->makeUserLabels($user->id, $labels);
                 }
@@ -2437,4 +2437,4 @@ private function makeUserLabels($userId, $labels = [])
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public function batchAddUsers(Request $request)`
`310`	`310`	`$user->save();`
`311`	`311`
`312`	`312`	`// 初始化默认标签`
`313`		`- if (count(self::$systemConfig['initial_labels_for_user']) > 0) {`
	`313`	`+ if (!empty(self::$systemConfig['initial_labels_for_user'])) {`
`314`	`314`	`$labels = explode(',', self::$systemConfig['initial_labels_for_user']);`
`315`	`315`	`$this->makeUserLabels($user->id, $labels);`
`316`	`316`	`}`
`@@ -2437,4 +2437,4 @@ private function makeUserLabels($userId, $labels = [])`
`2437`	`2437`	`}`
`2438`	`2438`	`}`
`2439`	`2439`	`}`
`2440`		`-}`
	`2440`	`+}`