Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -21,6 +21,9 @@ class ProjectDeptController extends BaseController
      * @time   :2023/6/17 16:13
      * @time   :2023/6/17 16:13
      */
      */
     public function lists(DeptLogic $deptLogic){
     public function lists(DeptLogic $deptLogic){
+        if(isset($this->param['pid'])){
+            $this->map['pid'] = $this->param['pid'];
+        }
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $this->map['title'] = ['like','%'.$this->map['title'].'%'];
             $this->map['title'] = ['like','%'.$this->map['title'].'%'];
         }
         }

@@ -28,6 +28,13 @@ class ProjectMenuController extends BaseController
      */
      */
     public function lists(){
     public function lists(){
         $menuModel = new ProjectMenuModel();
         $menuModel = new ProjectMenuModel();
+        if(isset($this->param['pid'])){
+            $this->map['pid'] = $this->param['pid'];
+        }
+        //是否为权限菜单
+        if(isset($this->param['is_role'])){
+            $this->map['is_role'] = $this->param['is_role'];
+        }
         $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
         $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -170,7 +170,7 @@ class BaseController extends Controller
                     case 'operator_id':
                     case 'operator_id':
                         if(!empty($v)){
                         if(!empty($v)){
                             $name = (new UserModel())->read(['id'=>$v],['id','name']);
                             $name = (new UserModel())->read(['id'=>$v],['id','name']);
-                            $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
+                            $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '管理员';
                         }
                         }
                         break;
                         break;
                 }
                 }

@@ -92,15 +92,7 @@ class ProjectMenuLogic extends BaseLogic
      * @time   :2023/6/21 17:26
      * @time   :2023/6/21 17:26
      */
      */
     public function MenuList(){
     public function MenuList(){
-        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO]);
-        $menu = array();
-        foreach ($lists as $v){
-            $v = (array)$v;
-            if ($v['pid'] == 0) {
-                $v['sub'] = _get_child($v['id'], $lists);
-                $menu[]   = $v;
-            }
-        }
-        return $this->success($menu);
+        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO,'pid'=>$this->model::ZERO]);
+        return $this->success($lists);
     }
     }
 }
 }

@@ -35,11 +35,8 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_add(){
     public function user_add(){
-        $info = $this->model->read(['mobile'=>$this->param['mobile']]);
-        if($info !== false){
-            $this->fail('当前手机号码已存在');
-        }
-        //TODO::上传头像
+        $this->verifyMobile();//验证手机号
+        $this->param['password'] = base64_encode(md5($this->param['password']));
         $rs = $this->model->add($this->param);
         $rs = $this->model->add($this->param);
         if($rs === false){
         if($rs === false){
             $this->fail('添加失败');
             $this->fail('添加失败');
@@ -54,12 +51,15 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_edit(){
     public function user_edit(){
-        $info = $this->model->read(['mobile'=>$this->param['mobile'],'id'=>['!=',$this->param['id']]]);
-        if($info !== false){
-            $this->fail('当前手机号码已存在');
+        $this->verifyMobile();//验证手机号
+        //验证密码是否更改
+        if(isset($this->param['password']) && !empty($this->param['password'])){
+            $info = $this->model->read(['id'=>$this->param['id']]);
+            if($info['password'] != $this->param['password']){
+                $this->param['password'] = base64_encode(md5($this->param['password']));
+            }
         }
         }
-        //TODO::上传头像
-        $rs = $this->model->edits($this->param);
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){
             $this->fail('编辑失败');
             $this->fail('编辑失败');
         }
         }
@@ -80,4 +80,26 @@ class UserLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :验证手机号
+     * @name   :verifyMobile
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:47
+     */
+    public function verifyMobile(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $info = $this->model->read(['mobile'=>$this->param['mobile'],'id'=>['!=',$this->param['id']]]);
+            if($info !== false){
+                $this->fail('当前手机号码已存在');
+            }
+        }else{
+            $info = $this->model->read(['mobile'=>$this->param['mobile']]);
+            if($info !== false){
+                $this->fail('当前手机号码已存在');
+            }
+        }
+        return true;
+    }
 }
 }

@@ -24,8 +24,9 @@ class UserRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'mobile'=>'required|string|max:11||unique:gl_project_user',
+            'mobile'=>'required|string|max:11',
             'password'=>'required|string|min:5',
             'password'=>'required|string|min:5',
+            'project_id'=>'required',
             'name'=>'required|max:20',
             'name'=>'required|max:20',
             'role_id'=>'required'
             'role_id'=>'required'
         ];
         ];
@@ -35,6 +36,7 @@ class UserRequest extends FormRequest
     {
     {
         return [
         return [
             'mobile.required'=>'号码必须填写',
             'mobile.required'=>'号码必须填写',
+            'project_id.required'=>'所属项目必须填写',
             'mobile.string'=>'号码中含有非法文字',
             'mobile.string'=>'号码中含有非法文字',
             'mobile.max'   =>  '号码不大于11字符.',
             'mobile.max'   =>  '号码不大于11字符.',
             'password.required'=>'密码必须填写',
             'password.required'=>'密码必须填写',