diff --git a/seahub/api2/endpoints/admin/dingtalk.py b/seahub/api2/endpoints/admin/dingtalk.py index 2e3a58dd47..11a9c9502f 100644 --- a/seahub/api2/endpoints/admin/dingtalk.py +++ b/seahub/api2/endpoints/admin/dingtalk.py @@ -361,7 +361,6 @@ class AdminDingtalkDepartmentsImport(APIView): group_id=group_id, provider=DINGTALK_PROVIDER, outer_id=department_obj_id, - outer_parent_id=parent_department_id, ) department_map_to_group_dict[department_obj_id] = group_id diff --git a/seahub/api2/endpoints/admin/work_weixin.py b/seahub/api2/endpoints/admin/work_weixin.py index cf600eb2dc..bcc51b0772 100644 --- a/seahub/api2/endpoints/admin/work_weixin.py +++ b/seahub/api2/endpoints/admin/work_weixin.py @@ -391,7 +391,6 @@ class AdminWorkWeixinDepartmentsImport(APIView): group_id=group_id, provider=WORK_WEIXIN_PROVIDER, outer_id=department_obj_id, - outer_parent_id=parent_department_id, ) department_map_to_group_dict[department_obj_id] = group_id diff --git a/seahub/auth/models.py b/seahub/auth/models.py index 64b9aa5462..5fe2a87545 100644 --- a/seahub/auth/models.py +++ b/seahub/auth/models.py @@ -174,7 +174,6 @@ class ExternalDepartment(models.Model): group_id = models.IntegerField(unique=True) provider = models.CharField(max_length=32) outer_id = models.BigIntegerField() - outer_parent_id = models.BigIntegerField() objects = ExternalDepartmentManager() diff --git a/seahub/dingtalk/management/commands/fix_dingtalk_departments_sync.py b/seahub/dingtalk/management/commands/fix_dingtalk_departments_sync.py index 0ced359a7a..747c3d384d 100644 --- a/seahub/dingtalk/management/commands/fix_dingtalk_departments_sync.py +++ b/seahub/dingtalk/management/commands/fix_dingtalk_departments_sync.py @@ -98,7 +98,6 @@ class Command(BaseCommand): # check department argument group_name = department_obj.get('name') department_obj_id = department_obj.get('id') - parent_department_id = department_obj.get('parentid', 0) if department_obj_id is None or not group_name: continue @@ -116,7 +115,6 @@ class Command(BaseCommand): group_id=group.id, provider=DINGTALK_PROVIDER, outer_id=department_obj_id, - outer_parent_id=parent_department_id, ) count += 1 diff --git a/seahub/work_weixin/management/commands/fix_work_weixin_departments_sync.py b/seahub/work_weixin/management/commands/fix_work_weixin_departments_sync.py index 13a03b44c1..0d7c08763f 100644 --- a/seahub/work_weixin/management/commands/fix_work_weixin_departments_sync.py +++ b/seahub/work_weixin/management/commands/fix_work_weixin_departments_sync.py @@ -97,7 +97,6 @@ class Command(BaseCommand): # check department argument group_name = department_obj.get('name') department_obj_id = department_obj.get('id') - parent_department_id = department_obj.get('parentid', 0) if department_obj_id is None or not group_name: continue @@ -115,7 +114,6 @@ class Command(BaseCommand): group_id=group.id, provider=WORK_WEIXIN_PROVIDER, outer_id=department_obj_id, - outer_parent_id=parent_department_id, ) count += 1 diff --git a/sql/mysql.sql b/sql/mysql.sql index df64457ae2..cde8a349b8 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1288,7 +1288,6 @@ CREATE TABLE `external_department` ( `group_id` int(11) NOT NULL, `provider` varchar(32) NOT NULL, `outer_id` bigint(20) NOT NULL, - `outer_parent_id` bigint(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `group_id` (`group_id`), UNIQUE KEY `external_department_provider_outer_id_8dns6vkw_uniq` (`provider`,`outer_id`) diff --git a/sql/sqlite3.sql b/sql/sqlite3.sql index c7aabc8a77..5bd25b1add 100644 --- a/sql/sqlite3.sql +++ b/sql/sqlite3.sql @@ -600,6 +600,6 @@ CREATE INDEX "ocm_share_received_from_server_url_10527b80" ON "ocm_share_receive CREATE INDEX "ocm_share_received_repo_id_9e77a1b9" ON "ocm_share_received" ("repo_id"); CREATE INDEX "ocm_share_received_provider_id_60c873e0" ON "ocm_share_received" ("provider_id"); CREATE TABLE "repo_auto_delete" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "repo_id" varchar(36) NOT NULL UNIQUE, "days" integer NOT NULL); -CREATE TABLE "external_department" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "group_id" integer NOT NULL UNIQUE, "provider" varchar(32) NOT NULL, "outer_id" bigint NOT NULL, "outer_parent_id" bigint NOT NULL); +CREATE TABLE "external_department" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "group_id" integer NOT NULL UNIQUE, "provider" varchar(32) NOT NULL, "outer_id" bigint NOT NULL); CREATE UNIQUE INDEX "external_department_provider_outer_id_8dns6vkw_uniq" ON "external_department" (`provider`,`outer_id`); COMMIT;