Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type

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;

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>