Merge remote-tracking branch 'origin/master' into akun

@@ -610,6 +610,11 @@ class ProjectController extends BaseController
         $hrManagerModel = new ManageHr();
         $hrManagerModel = new ManageHr();
         if(!isset($this->map['status'])){
         if(!isset($this->map['status'])){
             $this->map['status'] = $hrManagerModel::STATUS_ONE;
             $this->map['status'] = $hrManagerModel::STATUS_ONE;
+        }else{
+            if(!is_array($this->map['status'])){
+                $this->map['status'] = [$this->map['status']];
+            }
+            $this->map['status'] = ['in',$this->map['status']];
         }
         }
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];

@@ -96,7 +96,11 @@ class OperationHeartbeatController extends BaseController
                     if($info['manager_id'] != 0){
                     if($info['manager_id'] != 0){
                         $managerModel = new Manage();
                         $managerModel = new Manage();
                         $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
                         $managerInfo = $managerModel->read(['id'=>$info['manager_id']],['name']);
-                        $info['message'] = '此页面数据已有人在编辑，请勿重复操作！操作人ip：'.$info['ip'].'操作的管理员为：'.$managerInfo['name'];
+                        if(($info['ip'] == $this->request->ip()) && ($info['manager_id'] == $this->user['manager_id'])){
+                            $info['status'] = 0;
+                        }else{
+                            $info['message'] = '此页面数据已有人在编辑，请勿重复操作！操作人ip：'.$info['ip'].'操作的管理员为：'.$managerInfo['name'];
+                        }
                     }else{
                     }else{
                         //账号密码登录
                         //账号密码登录
                         $userModel = new User();
                         $userModel = new User();

@@ -13,6 +13,7 @@ use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
+use App\Models\Template\TemplateTypeMain;
 
 
 class CustomTemplateLogic extends BaseLogic
 class CustomTemplateLogic extends BaseLogic
 {
 {
@@ -179,10 +180,11 @@ class CustomTemplateLogic extends BaseLogic
                 $this->fail('404页面已存在');
                 $this->fail('404页面已存在');
             }
             }
             if($this->param['url'] == 'search'){
             if($this->param['url'] == 'search'){
-                $bTemplateMainModel = new BTemplateMain();
+                $bTemplateMainModel = new TemplateTypeMain();
                 $mainInfo = $bTemplateMainModel->read(['type'=>8]);
                 $mainInfo = $bTemplateMainModel->read(['type'=>8]);
                 if($mainInfo !== false){
                 if($mainInfo !== false){
                     $this->param['html'] = $mainInfo['main_html'];
                     $this->param['html'] = $mainInfo['main_html'];
+                    $this->param['html_style'] = "<style id='globalsojs-styles'></style>";
                 }
                 }
             }
             }
             $this->param['project_id'] = $this->user['project_id'];
             $this->param['project_id'] = $this->user['project_id'];