diff --git a/agent/admin/controllers/pingan/organization/User.php b/agent/admin/controllers/pingan/organization/User.php
index 2cad1aa2..8ab8c1b1 100644
--- a/agent/admin/controllers/pingan/organization/User.php
+++ b/agent/admin/controllers/pingan/organization/User.php
@@ -265,6 +265,7 @@ class User extends BaseController
                 $centerNumber = Pingan_users_model::TYPE_CENTER_CODE[$number] ?: '';
                 $cityRow = $this->area_model->get(["city_name like '%{$cityId}%'" => null]);
                 $teamUserId = $depUserId = $areaUserId = '';
+                $role = $this->mdSysRole->map('roleCode', 'roleId', ['status' => 0], '', '', '', 'roleId,roleCode');
                 if ($areaCode) { //获取区域用户id
                     $areaRow = $this->pinganUsers->get(['userCode' => $areaCode]);
                     if ($areaRow) {
@@ -281,6 +282,8 @@ class User extends BaseController
                         $org && $areaAddData['orgId'] = $org['parentId'];
                         $cityRow && $areaAddData['cityId'] = $cityRow['city_id'];
                         $cityRow && $areaAddData['provinceId'] = $cityRow['province_id'];
+                        $roleCode = "role-{$areaAddData['groupType']}";
+                        $role[$roleCode] && $areaAddData['roleId'] = $role[$roleCode];
                         $areaUserId = $this->pinganUsers->add($areaAddData);
                     }
                 }
@@ -301,6 +304,8 @@ class User extends BaseController
                         $cityRow && $depAddData['cityId'] = $cityRow['city_id'];
                         $cityRow && $depAddData['provinceId'] = $cityRow['province_id'];
                         $areaUserId && $depAddData['areaId'] = $areaUserId;
+                        $roleCode = "role-{$depAddData['groupType']}";
+                        $role[$roleCode] && $depAddData['roleId'] = $role[$roleCode];
                         $depUserId = $this->pinganUsers->add($depAddData);
                     }
                 }
@@ -322,6 +327,8 @@ class User extends BaseController
                         $cityRow && $teamAddData['provinceId'] = $cityRow['province_id'];
                         $areaUserId && $teamAddData['areaId'] = $areaUserId;
                         $depUserId && $teamAddData['depId'] = $depUserId;
+                        $roleCode = "role-{$teamAddData['groupType']}";
+                        $role[$roleCode] && $teamAddData['roleId'] = $role[$roleCode];
                         $teamUserId = $this->pinganUsers->add($teamAddData);
                     }
                 }
@@ -339,11 +346,8 @@ class User extends BaseController
                 $areaUserId && $userData['areaId'] = $areaUserId;
                 $depUserId && $userData['depId'] = $depUserId;
                 $teamUserId && $userData['teamId'] = $teamUserId;
-                //匹配角色
-                $role = $this->mdSysRole->get(['roleCode' => "role-{$groupType}"], 'roleId');
-                if ($role) {
-                    $userData['roleId'] = $role['roleId'];
-                }
+                $roleCode = "role-{$userData['groupType']}";
+                $role[$roleCode] && $userData['roleId'] = $role[$roleCode];
                 $user = $this->pinganUsers->get(['userCode' => $userCode]);
                 if ($user) {
                     debug_log("更新数据:" . json_encode($userData, JSON_UNESCAPED_UNICODE), $log_file);