|
@@ -47,7 +47,7 @@ class NoticeManageController extends AdminController
|
|
$list = $builder->paginate();
|
|
$list = $builder->paginate();
|
|
$data['req'] = $req;
|
|
$data['req'] = $req;
|
|
$data['list'] = $list;
|
|
$data['list'] = $list;
|
|
- $data['ids'] = Cache::get('notice-'.$user['id'])[$req['page']??1] ?? [];
|
|
|
|
|
|
+ $data['ids'] = Cache::get('notice-'.$user['id']) ?? [];
|
|
|
|
|
|
$content = new Content();
|
|
$content = new Content();
|
|
Admin::disablePjax();
|
|
Admin::disablePjax();
|
|
@@ -61,7 +61,14 @@ class NoticeManageController extends AdminController
|
|
$user = Admin::user();
|
|
$user = Admin::user();
|
|
|
|
|
|
$arr = Cache::get($req['type'].'-'.$user['id']) ?? [];
|
|
$arr = Cache::get($req['type'].'-'.$user['id']) ?? [];
|
|
- $arr[$req['page']] = $req['ids']??[];
|
|
|
|
|
|
+ foreach ($req['ids'] as $k => $v) {
|
|
|
|
+ if (isset($arr[$v])) {
|
|
|
|
+ unset($arr[$v]);
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ $arr[$v] = $v;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
Cache::set($req['type'].'-'.$user['id'], $arr, 300);
|
|
Cache::set($req['type'].'-'.$user['id'], $arr, 300);
|
|
|
|
|
|
return out();
|
|
return out();
|
|
@@ -79,14 +86,11 @@ class NoticeManageController extends AdminController
|
|
$user = Admin::user();
|
|
$user = Admin::user();
|
|
|
|
|
|
$arr = Cache::get('notice-'.$user['id']) ?? [];
|
|
$arr = Cache::get('notice-'.$user['id']) ?? [];
|
|
- $ids = [];
|
|
|
|
- foreach ($arr as $k => $v) {
|
|
|
|
- $ids = array_merge($ids, $v);
|
|
|
|
- }
|
|
|
|
- $ids = array_values(array_unique($ids));
|
|
|
|
|
|
+ $ids = array_values(array_unique($arr));
|
|
if (empty($ids)) {
|
|
if (empty($ids)) {
|
|
return out(null, 10001, '请勾选要发送通知的用户');
|
|
return out(null, 10001, '请勾选要发送通知的用户');
|
|
}
|
|
}
|
|
|
|
+
|
|
Cache::delete('notice-'.$user['id']);
|
|
Cache::delete('notice-'.$user['id']);
|
|
foreach ($ids as $id) {
|
|
foreach ($ids as $id) {
|
|
$user_id = Patient::where('id', $id)->value('user_id');
|
|
$user_id = Patient::where('id', $id)->value('user_id');
|
|
@@ -118,6 +122,20 @@ class NoticeManageController extends AdminController
|
|
return out();
|
|
return out();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public function getCacheUsers()
|
|
|
|
+ {
|
|
|
|
+ $req = request()->post();
|
|
|
|
+ $user = Admin::user();
|
|
|
|
+ $ids = Cache::get($req['type'].'-'.$user['id']) ?? [];
|
|
|
|
+ $nameText = '';
|
|
|
|
+ if (!empty($ids)) {
|
|
|
|
+ $nameArr = Patient::whereIn('id', $ids)->pluck('name')->toArray();
|
|
|
|
+ $nameText = implode(';', $nameArr);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return out($nameText);
|
|
|
|
+ }
|
|
|
|
+
|
|
private function send($open_id, $tempId, $msg)
|
|
private function send($open_id, $tempId, $msg)
|
|
{
|
|
{
|
|
try {
|
|
try {
|