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

@@ -54,7 +54,7 @@ class AyrShareController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'id'=>['required'],
             'id'=>['required'],
         ],[
         ],[
-            'id.required' => 'SHARE_ID不能为空',
+            'id.required' => 'ID不能为空',
         ]);
         ]);
         $info = $ayrShareLogic->ayr_share_info();
         $info = $ayrShareLogic->ayr_share_info();
         $ayrShareHelper = new AyrShareHelper();
         $ayrShareHelper = new AyrShareHelper();
@@ -62,12 +62,14 @@ class AyrShareController extends BaseController
         if(isset($share_info['activeSocialAccounts'])){
         if(isset($share_info['activeSocialAccounts'])){
             $str = json_encode($share_info['activeSocialAccounts']);
             $str = json_encode($share_info['activeSocialAccounts']);
             if($str != $info['bind_platforms']){
             if($str != $info['bind_platforms']){
-                $res = $ayrShareLogic->ayr_share_edit(['bind_platforms'=>$str],$this->param['share_id']);
+                $ayrShareLogic->ayr_share_edit(['bind_platforms'=>$str],$this->param['id']);
+                $res = true;
             }else{
             }else{
                 $res = false;
                 $res = false;
             }
             }
         }else{
         }else{
-            $res = $ayrShareLogic->ayr_share_edit(['bind_platforms'=>''],$this->param['share_id']);
+            $ayrShareLogic->ayr_share_edit(['bind_platforms'=>''],$this->param['id']);
+            $res = true;
         }
         }
         $this->response('success',Code::SUCCESS,['is_true'=>$res]);
         $this->response('success',Code::SUCCESS,['is_true'=>$res]);
     }
     }
@@ -113,7 +115,6 @@ class AyrShareController extends BaseController
         //发送请求删除社交用户
         //发送请求删除社交用户
         $ayrShareHelper = new AyrShareHelper();
         $ayrShareHelper = new AyrShareHelper();
         $res = $ayrShareHelper->deleted_profiles($data);
         $res = $ayrShareHelper->deleted_profiles($data);
-
         if($res['status'] == 'fail'){
         if($res['status'] == 'fail'){
             $this->response('同步删除失败');
             $this->response('同步删除失败');
         }
         }

@@ -52,7 +52,7 @@ class AyrShareLogic extends BaseLogic
             'title'=>$res['title'],
             'title'=>$res['title'],
             'ref_id'=>$res['refId'],
             'ref_id'=>$res['refId'],
             'profile_key'=>$res['profileKey'],
             'profile_key'=>$res['profileKey'],
-            'user_id'=>$this->user['id'],
+            'operator_id'=>$this->user['id'],
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'name'=>$this->param['name'],
             'name'=>$this->param['name'],
         ];
         ];

@@ -30,6 +30,9 @@ class GroupLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+        if(isset($this->param['pid']) && !empty($this->param['pid'])){
+            $this->add_update_parent($this->param);
+        }
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -45,6 +48,8 @@ class GroupLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+        //更新父类
+        $this->update_parent($this->param,$this->param['id']);
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -66,12 +71,44 @@ class GroupLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function group_del(){
     public function group_del(){
-        $ids = $this->param['id'];
-        $this->param['id'] = ['in',$this->param['id']];
-        $rs = $this->del($this->param,$ids);
+        //查看当前是否拥有父类
+        $info = $this->model->read(['pid'=>$this->param['id']]);
+        if($info !== false){
+            $this->fail('当前删除组织拥有下级组织,不允许删除');
+        }
+        $rs = $this->model->del($this->param);
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @name   :(更新父类成员)update_parent
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/17 9:22
+     */
+    public function update_parent($param,$id = ''){
+        if(!empty($id)){
+            $param = $this->model->read(['id'=>$id]);
+        }
+        //查询当前组是否拥有父类
+        if($param['pid'] != 0){
+            $parent_info = $this->model->read(['id'=>$param['pid']]);
+            //把添加成员合并到上级
+            $str = trim($param['user_list'].$parent_info['user_list'],',');
+            $mergedString = ','.implode(',', array_unique(explode(',', $str))).',';
+            $rs = $this->model->edit(['user_list'=>$mergedString],['id'=>$parent_info['id']]);
+            if($rs === false){
+                $this->fail('更新父级失败');
+            }
+            //查看当前父级是否还拥有父级
+            if($parent_info['pid'] != 0){
+                $rs = $this->update_parent($parent_info);
+            }
+        }
+        return $this->success($rs);
+    }
+
 }
 }