From 6caf99e9847773442aa86a1702db385fa9017372 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 13 Jan 2020 11:47:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Public/cp_login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/Public/cp_login.html b/Application/Admin/View/Public/cp_login.html
index 18040110c..9a262aac9 100644
--- a/Application/Admin/View/Public/cp_login.html
+++ b/Application/Admin/View/Public/cp_login.html
@@ -53,7 +53,7 @@
       </div>  
 
 
-      <div class="logintop">    
+      <div class="logintop" style="display: none">
         <span>欢迎登录后台管理界面平台</span>    
         <ul>
         <li><a href="http://xue.vlcms.com/" target="_blank">帮助</a></li>

From ce92602ca08df43ab08e428ee606456f1fb65726 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 13 Jan 2020 13:45:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E8=AE=A2=E5=8D=95=E9=87=8D=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/StatementController.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/StatementController.class.php b/Application/Admin/Controller/StatementController.class.php
index 6a6b28989..66f698e1a 100644
--- a/Application/Admin/Controller/StatementController.class.php
+++ b/Application/Admin/Controller/StatementController.class.php
@@ -104,7 +104,7 @@ class StatementController extends ThinkController
             "statement_end_time"=>array("EGT",strtotime($_REQUEST['time_start'])),
             "company_id"=>$CompanyId
         );
-        $bres = $Statement->field("statement_begin_time,statement_end_time")->where($checkmap)->find();
+        $bres = $Statement->field("id,statement_begin_time,statement_end_time")->where($checkmap)->find();
         if($bres){
             $repart=true;
             $begin =  $_REQUEST['time_start'];
@@ -122,6 +122,9 @@ class StatementController extends ThinkController
             "statement_end_time"=>array("EGT",strtotime($_REQUEST['time_end'])),
             "company_id"=>$CompanyId
         );
+        if($repart){
+            $checkmap["id"]=array("NEQ",$bres["id"]);
+        }
         $bres = $Statement->field("statement_begin_time,statement_end_time")->where($checkmap)->find();
         if($bres){
             $repart=true;