|
@@ -91,7 +91,9 @@ class KFMessageController extends CatchController
|
|
}
|
|
}
|
|
$gzh_names = collect();
|
|
$gzh_names = collect();
|
|
foreach (explode('#', trim($gzh_ids, '#')) as $gzh_id) {
|
|
foreach (explode('#', trim($gzh_ids, '#')) as $gzh_id) {
|
|
- $gzh_names->push($gzhs->get($gzh_id)->nick_name ?? 'ID:'. $gzh_id);
|
|
|
|
|
|
+ if($gzh_id) {
|
|
|
|
+ $gzh_names->push($gzhs->get($gzh_id)->nick_name ?? 'ID:'. $gzh_id);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
return $gzh_names->unique()->join(', ');
|
|
return $gzh_names->unique()->join(', ');
|
|
@@ -161,7 +163,6 @@ class KFMessageController extends CatchController
|
|
public function updateGZH(Request $request){
|
|
public function updateGZH(Request $request){
|
|
$this->validate($request, [
|
|
$this->validate($request, [
|
|
'id' => 'required',
|
|
'id' => 'required',
|
|
- 'gzh_ids' => 'required|array'
|
|
|
|
]);
|
|
]);
|
|
|
|
|
|
$message = WechatKfMessageModel::where([
|
|
$message = WechatKfMessageModel::where([
|
|
@@ -172,7 +173,7 @@ class KFMessageController extends CatchController
|
|
])->first();
|
|
])->first();
|
|
if($message) {
|
|
if($message) {
|
|
$allGzhIds = $request->input('gzh_ids');
|
|
$allGzhIds = $request->input('gzh_ids');
|
|
- if(2 == $message->u_type) {
|
|
|
|
|
|
+ if(2 == $message->u_type && collect($allGzhIds)->isNotEmpty()) {
|
|
$configGzhIds = DB::table('gzh_ug_maps')
|
|
$configGzhIds = DB::table('gzh_ug_maps')
|
|
->where([
|
|
->where([
|
|
['is_enabled', '=', 1],
|
|
['is_enabled', '=', 1],
|