合并分支 'master-server' 到 'master'

Master server



查看合并请求 !858

@@ -361,11 +361,16 @@ class ProjectController extends BaseController
         if($item['type'] == Project::TYPE_ONE){//建站中
         if($item['type'] == Project::TYPE_ONE){//建站中
             $processModel = new ProcessRecords();
             $processModel = new ProcessRecords();
             $item['sign_project'] = 0;
             $item['sign_project'] = 0;
-            $proInfo = $processModel->read(['project_id'=>$item['id'],'date'=>['>',date('Y-m-d', strtotime('-3 days'))]],['id']);
+            $count = $processModel->counts(['project_id'=>$item['id']]);
+            if($count < 1){
+                $item['sign_project'] = 0;
+            }else{
+                $proInfo = $processModel->read(['project_id'=>$item['id'],'date'=>['<',date('Y-m-d', strtotime('-3 days'))]],['id']);
                 if($proInfo === false){
                 if($proInfo === false){
                     $item['sign_project'] = 1;
                     $item['sign_project'] = 1;
                 }
                 }
             }
             }
+        }
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);

@@ -168,7 +168,8 @@ class InquiryController extends BaseController
         $data = $data['list'] ?? [];
         $data = $data['list'] ?? [];
         foreach ($data as &$item){
         foreach ($data as &$item){
             //非正常登录的
             //非正常登录的
-            if($this->user['login_source']??0 != 2 && $this->user['login_source']??0 != 3){
+
+            if(($this->user['login_source']??0) != 2 && ($this->user['login_source']??0) != 3){
                 //脱敏
                 //脱敏
                 !empty($item['email']) && $item['email'] = email_desensitize($item['email']);
                 !empty($item['email']) && $item['email'] = email_desensitize($item['email']);
                 !empty($item['phone']) && $item['phone'] = substr($item['phone'], 0, -4) . '****';
                 !empty($item['phone']) && $item['phone'] = substr($item['phone'], 0, -4) . '****';