提交代码

app/Logic/SystemNoticeLogic.php

@@ -323,7 +323,7 @@ class SystemNoticeLogic
 
 
     static public function getAllUser()
     static public function getAllUser()
     {
     {
-        return DB::table('user_info')->where('status',0)->whereIn('department_name',['产品','技术','前端','后台','测试'])->orderBy('userId','desc')->pluck('name','name');
+        return DB::table('user_info')->where('status',0)->orderBy('userId','desc')->pluck('name','name');
     }
     }
 
 
     static public function setSystemInfo($data)
     static public function setSystemInfo($data)
@@ -356,6 +356,18 @@ class SystemNoticeLogic
         //韦伯系统是所有的,通知所有人
         //韦伯系统是所有的,通知所有人
         $allUpdate = $systemUpdateModel->getWhereObj($where)->get()->toArray();
         $allUpdate = $systemUpdateModel->getWhereObj($where)->get()->toArray();
 
 
+
+        // 查找所有通知用户邮箱和ID
+        $sendUser = DB::table('t_user_perm')->where('begDate','<=',$date)
+            ->where('endDate','>=',$date)
+            ->select('username','userId')->get();
+
+
+        $createNotice->createNoticeSaveData($allUpdate,$date,'韦伯系统',json_encode($sendUser));
+
+
+        return [];
+
         if (!empty($allUpdate)){
         if (!empty($allUpdate)){
             // 查找所有通知用户邮箱和ID
             // 查找所有通知用户邮箱和ID
             $sendUser = DB::table('t_user_perm')->where('begDate','<=',$date)
             $sendUser = DB::table('t_user_perm')->where('begDate','<=',$date)