gx

@@ -75,17 +75,18 @@ class TaskController extends BaseController
                     $map['manage_id'] = $this->map['manage_id'];
                     $map['manage_id'] = $this->map['manage_id'];
                 }
                 }
             }
             }
-        }elseif (isset($this->map['content']) && !empty($this->map['content'])){
-            $ids = $task->where('content', 'like','%'.$this->map['content'].'%')->pluck('id')->toArray();
-            $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
-            $map['manage_id'] = ['in',$manage_ids];
         }elseif (isset($this->map['search_type']) && !empty($this->map['search_type'])){
         }elseif (isset($this->map['search_type']) && !empty($this->map['search_type'])){
             if(isset($this->map['search']) && !empty($this->map['search'])) {
             if(isset($this->map['search']) && !empty($this->map['search'])) {
                 $projectModel = new Project();
                 $projectModel = new Project();
-                $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
-                $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray();
-                $map['manage_id'] = ['in',$manage_ids];
-                
+                if($this->map['search_type'] == 'project'){
+                    $ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $map['manage_id'] = ['in',$manage_ids];
+                }else{
+                    $ids = $task->where('content', 'like','%'.$this->map['search'].'%')->pluck('id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $map['manage_id'] = ['in',$manage_ids];
+                }
             }
             }
         }else{
         }else{
             if(isset($this->map['search_type']) && !empty($this->map['search_type'])){
             if(isset($this->map['search_type']) && !empty($this->map['search_type'])){

@@ -73,7 +73,7 @@ class ComController extends BaseController
         ]);
         ]);
         $userLogic = new UserLogic();
         $userLogic = new UserLogic();
         $this->param['id'] = $this->uid;
         $this->param['id'] = $this->uid;
-        $userLogic->edits($this->param);
+        $userLogic->edits();
         $this->response('编辑成功');
         $this->response('编辑成功');
     }
     }
 
 

@@ -74,7 +74,7 @@ class UserLogic extends BaseLogic
         }
         }
         $this->param['type'] = 1;
         $this->param['type'] = 1;
         $this->param['operator_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
-        $this->edits($this->param);
+        $this->edits();
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -116,20 +116,24 @@ class UserLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/6/17 16:41
      * @time   :2023/6/17 16:41
      */
      */
-    public function edits($param){
-        //查看密码是否修改
-        $info = $this->model->read(['id'=>$param['id']]);
-        $param['password'] = base64_encode(md5($param['password']));
-        if($param['password'] == $info['password']){
-            unset($param['password']);
+    public function edits(){
+        if(!isset($this->param['password']) || empty($this->param['password'])){
+            unset($this->param['password']);
+        }else{
+            $this->param['password'] = base64_encode(md5($this->param['password']));
+        }
+        $info = $this->model->read(['mobile'=>$this->param['mobile'],
+            'project_id'=>$this->user['project_id'],'id'=>['!=',$this->param['id']]]);
+        if($info !== false){
+            $this->fail('当前手机号码已注册');
         }
         }
         //密码加密
         //密码加密
-        $rs = $this->model->edit($param,['id'=>$param['id']]);
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
         //清空当前用户登录缓存
         //清空当前用户登录缓存
-        Cache::pull($info['token']);
+        Cache::pull($this->user['token']);
         return $this->success();
         return $this->success();
     }
     }
 }
 }