fix: organization bug (#2366)

* fix: organization bug

* fix: Fix parameter types

Author: WeiMengXS

.changelog/2366.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/tencentcloud_organization_org_member: Fix parameter types and update logic
+```
+
+```release-note:bug
+resource/tencentcloud_organization_org_member_email: Fix parameter types
+```

tencentcloud/resource_tc_organization_org_member.go

@@ -375,16 +375,26 @@ func resourceTencentCloudOrganizationOrgMemberUpdate(d *schema.ResourceData, met
 		if v, _ := d.GetOk("policy_type"); v != nil {
 			updateRequest.PolicyType = helper.String(v.(string))
 		}
+		if v, _ := d.GetOk("permission_ids"); v != nil {
+			ids := v.(*schema.Set).List()
+			for i := range ids {
+				id := ids[i].(int)
+				updateRequest.PermissionIds = append(updateRequest.PermissionIds, helper.IntUint64(id))
+			}
+		}
 	}
 
 	if d.HasChange("permission_ids") {
 		if v, _ := d.GetOk("permission_ids"); v != nil {
 			ids := v.(*schema.Set).List()
 			for i := range ids {
-				id := ids[i].(uint64)
-				updateRequest.PermissionIds = append(updateRequest.PermissionIds, helper.Uint64(id))
+				id := ids[i].(int)
+				updateRequest.PermissionIds = append(updateRequest.PermissionIds, helper.IntUint64(id))
 			}
 		}
+		if v, _ := d.GetOk("policy_type"); v != nil {
+			updateRequest.PolicyType = helper.String(v.(string))
+		}
 	}
 
 	if d.HasChange("is_allow_quit") {

tencentcloud/resource_tc_organization_org_member_email.go

@@ -185,7 +185,7 @@ func resourceTencentCloudOrganizationOrgMemberEmailRead(d *schema.ResourceData,
 		return nil
 	}
 
-	_ = d.Set("member_uin", memberUin)
+	_ = d.Set("member_uin", helper.StrToInt64(memberUin))
 
 	if orgMemberEmail.Email != nil {
 		_ = d.Set("email", orgMemberEmail.Email)

tencentcloud/resource_tc_organization_org_member_test.go

@@ -10,14 +10,14 @@ func TestAccTencentCloudOrganizationOrgMemberResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			testAccPreCheck(t)
+			testAccPreCheckCommon(t, ACCOUNT_TYPE_ORGANIZATION)
 		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccOrganizationOrgMember,
 				Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_organization_org_member.org_member", "id"),
-					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "name", "terraform_test"),
+					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "name", "tf_example"),
 					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "node_id", "59849"),
 					resource.TestCheckResourceAttrSet("tencentcloud_organization_org_member.org_member", "permission_ids.#"),
 					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "policy_type", "Financial"),
@@ -27,7 +27,7 @@ func TestAccTencentCloudOrganizationOrgMemberResource_basic(t *testing.T) {
 			{
 				Config: testAccOrganizationOrgMemberUpdate,
 				Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_organization_org_member.org_member", "id"),
-					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "name", "terraform_test_1"),
+					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "name", "tf_example_1"),
 					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "node_id", "59849"),
 					resource.TestCheckResourceAttrSet("tencentcloud_organization_org_member.org_member", "permission_ids.#"),
 					resource.TestCheckResourceAttr("tencentcloud_organization_org_member.org_member", "policy_type", "Financial"),
@@ -46,7 +46,7 @@ func TestAccTencentCloudOrganizationOrgMemberResource_basic(t *testing.T) {
 const testAccOrganizationOrgMember = `
 
 resource "tencentcloud_organization_org_member" "org_member" {
-  name            = "terraform_test"
+  name            = "tf_example"
   node_id         = 59849
   permission_ids  = [
     1,
@@ -57,18 +57,16 @@ resource "tencentcloud_organization_org_member" "org_member" {
   policy_type     = "Financial"
   remark          = "for terraform test"
 }
-
 `
 const testAccOrganizationOrgMemberUpdate = `
 
 resource "tencentcloud_organization_org_member" "org_member" {
-  name            = "terraform_test_1"
+  name            = "tf_example_1"
   node_id         = 59849
   permission_ids  = [
     1,
     2,
     3,
-    4,
   ]
   policy_type     = "Financial"
   remark          = "for terraform test"