vali 6 lat temu
rodzic
commit
24855c5aed

+ 15 - 10
application/admin/controller/Kfnotice.php

@@ -32,11 +32,11 @@ class Kfnotice extends Base
                     list($timerang, $sendtype, $groupid, $txttype, $txttext) = $arr;
                     if (strlen($timerang)) {
                         list($tbegin, $tend) = explode(",", $timerang);
-                         $bibao = true;
-                         $biaaodata =  [$tbegin, $tend.' 23:59:59'];
+                        $bibao = true;
+                        $biaaodata = [trim($tbegin . '00:00:00'), trim($tend . ' 23:59:59')];
                     }
 
-                    if (strlen($sendtype)) {
+                    if (intval($sendtype)) {
                         $where['sendtype'] = intval($sendtype);
                     }
 
@@ -64,12 +64,15 @@ class Kfnotice extends Base
             }
 
             $model = new ServicenoticeModel();
-            if (!$bibao){
+            if (!$bibao) {
                 $result = $model->where($where)->limit($offset, $limit)->order('id', 'desc')->select();
-            }else{
-                $result = $model->where($where)->where(function($query)use ($biaaodata){ $query->where(['sendtime'=>['>=',$biaaodata['0']]])->where(['sendtime'=>['<=',$biaaodata['1']]]);  })->limit($offset, $limit)->order('id', 'desc')->select();
+            } else {
+                $result = $model->where($where)->where(function ($query) use ($biaaodata) {
+                    $query->where(['sendtime' => ['>=', $biaaodata['0']]])->where(['sendtime' => ['<=', $biaaodata['1']]]);
+                })->limit($offset, $limit)->order('id', 'desc')->select();
             }
 
+
             foreach ($result as $key => $vo) {
                 $vo->readtime = empty($vo->readtime) ? '' : date('Y-m-d H:i:s', $vo->readtime);
                 $vo->uid = $vo->kfuser->user_name;
@@ -78,10 +81,12 @@ class Kfnotice extends Base
                 $result[$key] = array_merge($vo->toArray(), ['operate' => $this->makeBtn($vo->id)]);
             }
 
-            if (!$bibao){
+            if (!$bibao) {
                 $return['total'] = db('servicenotice')->where($where)->count();  //总数据
-            }else{
-                $return['total'] = $model->where($where)->where(function($query)use ($biaaodata){ $query->where(['sendtime'=>['>=',$biaaodata['0']]])->where(['sendtime'=>['<=',$biaaodata['1']]]);  })->count();
+            } else {
+                $return['total'] = $model->where($where)->where(function ($query) use ($biaaodata) {
+                    $query->where(['sendtime' => ['>=', $biaaodata['0']]])->where(['sendtime' => ['<=', $biaaodata['1']]]);
+                })->count();
             }
 
             $return['rows'] = $result;
@@ -108,7 +113,7 @@ class Kfnotice extends Base
             $group = intval(input('post.groupid', 0));
 
 
-            if (strlen($atext) || strlen($title)) {
+            if (!strlen($atext) || !strlen($title)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '标题和内容不能为空']);
             }
 

+ 1 - 1
application/admin/view/kfnotice/add.html

@@ -65,7 +65,7 @@
 
                         <label class="layui-form-label">内容</label>
                         <div class="layui-input-block">
-                            <textarea name="atext" id="atext" placeholder="请输入内容" lay-verify="required"
+                            <textarea name="atext" id="atext" placeholder="请输入内容"  lay-verify="required"
                                       class="layui-textarea"></textarea>
                         </div>
                 </div>