gx

@@ -31,7 +31,6 @@ class ProjectKeywordController extends BaseController
         $data['search_keywords'] = $info['search_keywords'];
         $data['search_keywords'] = $info['search_keywords'];
         $data['customer_keywords'] = $info['customer_keywords'];
         $data['customer_keywords'] = $info['customer_keywords'];
         $data['brand_keyword'] = $info['brand_keyword'];
         $data['brand_keyword'] = $info['brand_keyword'];
-        $data['minor_keywords'] = $info['minor_keywords'];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

@@ -165,10 +165,12 @@ class HrLogic extends BaseLogic
         if(($this->manager['gid'] != ManageHr::GID_ZERO) && isset($this->param['id'])){
         if(($this->manager['gid'] != ManageHr::GID_ZERO) && isset($this->param['id'])){
             $groupModel = new Group();
             $groupModel = new Group();
             $groupInfo = $groupModel->read(['id'=>$this->manager['gid']]);
             $groupInfo = $groupModel->read(['id'=>$this->manager['gid']]);
-            if (!in_array(20,$groupInfo['rights']) && ($data['manage_id'] != $this->manager['id'])) {
+            if ((!in_array(20,$groupInfo['rights'])) && ($data['manage_id'] != $this->manager['id'])) {
+                if(strpos($this->manager['rules'],'20') == false){
                     $this->fail('无权限查看其他用户信息');
                     $this->fail('无权限查看其他用户信息');
                 }
                 }
             }
             }
+        }
         foreach ($this->model::specieField() as $v){
         foreach ($this->model::specieField() as $v){
             $data[$v] = json_decode($data[$v],true);
             $data[$v] = json_decode($data[$v],true);
         }
         }

@@ -19,6 +19,7 @@ use App\Models\Channel\Zone;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Inquiry\InquiryIP;
 use App\Models\Inquiry\InquiryIP;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -179,6 +180,22 @@ class ProjectLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :选择服务器后双向绑定
+     * @name   :setServers
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/25 15:34
+     */
+    public function setServers($servers_id,$project_id){
+        $serversIpModel = new ServersIp();
+        $info = $serversIpModel->read(['id'=>$servers_id]);
+        $project_arr = explode(',',$info['project_arr']);
+        if(!in_array($project_id,$project_arr)){
+            array_push($project_id);
+        }
+    }
+
+    /**
      * @remark :危险项目同步图片与文件
      * @remark :危险项目同步图片与文件
      * @name   :syncImageFile
      * @name   :syncImageFile
      * @author :lyh
      * @author :lyh