1

application/api/service/RegisterService.php

@@ -106,7 +106,7 @@ class RegisterService
         }
 
         //判断邀请关系 if邀请人是用户的话则此客户的盘方修改为邀请人的盘方
-        $site_id = 100001;
+        $site_id = 10001;
         if ($agent_id == 0) {
             $agent_id = $this->inviteRelationship($referrer_id, $referrer_source);
         }else{

application/api_broker/controller/User.php

@@ -950,21 +950,21 @@ class User extends Basic
 
     /**
      * 客方同步到新表
-     * @return bool
+     * @return \think\Response
      */
     public function moveHouseAgent()
     {
         ini_set('memory_limit', '500M'); //内存限制
         set_time_limit(0);
         $s_user_agent = new UserAgentService();
-        $res = $s_user_agent->moveHouse();
-        return $res;
+        $s_user_agent->moveHouse();
+        return $this->response("200", "成功");
     }
 
 
     /**
      * 站点同步到新表
-     * @return bool
+     * @return \think\Response
      */
     public function moveHouseSiteId()
     {
@@ -972,8 +972,8 @@ class User extends Basic
         set_time_limit(0);
 
         $s = new UserSiteService();
-        $res = $s->moveUserSite();
-        return $res;
+        $s->moveUserSite();
+        return $this->response("200", "成功");
     }
 
 }
\ No newline at end of file

application/index/service/UserLogService.php

@@ -270,7 +270,7 @@ class  UserLogService
         $result['is_phone_button_show'] = $this->isPhoneButtonShow($user_id, $agent_id,$result['vip'],$result['user_phone'],$result['agent_id']);
 
         #编辑客户详情权限 0:有权限 1：无权限
-        $result['is_can_edit_user_info'] = $user_service->isCanEditUserInfo($result["agent_id"], $agent_id);
+        $result['is_can_edit_user_info'] = $user_service->isCanEditUserInfo($result["agent_id"], $agent_id,$user_id);
 
         return $result;
     }

application/index/service/UserService.php

@@ -582,20 +582,36 @@ class UserService
      * 编辑客户详情权限 0:有权限 1：无权限
      * @param $user_agent_id
      * @param $agent_id
+     * @param $user_id
      * @return int
      */
-    public function isCanEditUserInfo($user_agent_id,$agent_id){
+    public function isCanEditUserInfo($user_agent_id,$agent_id,$user_id){
         $is_can_edit_user_info = 1;
         if($user_agent_id == $agent_id){
             $is_can_edit_user_info = 0;
         }
 
-        $s_vip = new VipService();
-        //0:有权限 1：无权限
-        $is_can_edit = $s_vip->vip($agent_id,'index/pcEditClient');
-        if ($is_can_edit == 0) {
-            $is_can_edit_user_info = 0;
+        if($is_can_edit_user_info != 0){
+            $s_user_agent = new UserAgentService();
+            $user_agent_list = $s_user_agent->getUserAgentId($user_id);
+            if ($user_agent_list) {
+                foreach ($user_agent_list as $key => $value) {
+                    if($value['agent_id'] == $agent_id){
+                        $is_can_edit_user_info = 0;
+                    }
+                }
+            }
         }
+
+        if($is_can_edit_user_info != 0){
+            $s_vip = new VipService();
+            //0:有权限 1：无权限
+            $is_can_edit = $s_vip->vip($agent_id,'index/pcEditClient');
+            if ($is_can_edit == 0) {
+                $is_can_edit_user_info = 0;
+            }
+        }
+
         return $is_can_edit_user_info;
     }
 

application/index/service/UserSiteService.php

@@ -98,7 +98,7 @@ class UserSiteService
         $field = "id as user_id,site_ids as site_id,create_time";
         $params[] = ['EXP', 'site_ids IS NOT NULL '];
         $list = $this->m_user->moveUserSite($field, $params, $page, $limit, "id asc");
-
+        $list_ = [];
         foreach ($list as $k => $v) {
             $site_ids = explode(',',$v['site_id']);
             foreach ($site_ids as $k1 => $v1) {
@@ -111,9 +111,35 @@ class UserSiteService
             }
 
         }
-        // dump($list);exit;
-        $user_insert = $this->m_user_site->moveHouseInsertAll($list_);
-        return $user_insert;
+
+        foreach ($list_ as $k2 => $v2) {
+            $is_save = $this->isSaveEd($v2['user_id'],$v2['site_id']);
+
+            if($is_save){
+                unset($list_[$k2]);
+            }
+        }
+
+        if($list_)
+            $this->m_user_site->moveHouseInsertAll($list_);
+
+        return '';
+    }
+
+    /**
+     * 是否存在数据
+     * @param $user_id
+     * @param $site_id
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function isSaveEd($user_id,$site_id){
+        $params = [];
+        $params["user_id"] = $user_id;
+        $params["site_id"] = $site_id;
+        $params["is_del"] = 0;
+        $field = 'user_id';
+        $res = $this->m_user_site->selectUserSite($field,$params);
+        return $res;
     }
 
     /*