From c7f4633d83e15d353d5a2d3f2ef516d2b82bd168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 14 Jul 2024 19:16:46 +0800
Subject: [PATCH] =?UTF-8?q?ljm=20=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=20?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9B=B4=E6=96=B0=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_wechat/models/hr_employee.py       | 4 +++-
 yuthon_wechat/models/wecom_apps.py        | 2 +-
 yuthon_wechat/views/hr_employee_views.xml | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/yuthon_wechat/models/hr_employee.py b/yuthon_wechat/models/hr_employee.py
index 1017d4d77..2bb3d866b 100644
--- a/yuthon_wechat/models/hr_employee.py
+++ b/yuthon_wechat/models/hr_employee.py
@@ -25,11 +25,13 @@ class HrDepartment(models.Model):
                 wecom_department_id=record.wecom_id,
                 name=record.name,
                 name_en=record.wecom_name_en,
-                parentid=record.wecom_parent_id,
+                parentid=record.wecom_parent_id if record.wecom_parent_id else record.parent_id.wecom_id,
             )
             if not result_status:
                 sync_flag = False
                 sync_content = sync_content + record.name + "：" + result_content + ";\n"
+            else:
+                record.wecom_id = result_content.get("id", 0)
         if not sync_flag:
             raise UserError(str(sync_content))
 
diff --git a/yuthon_wechat/models/wecom_apps.py b/yuthon_wechat/models/wecom_apps.py
index 1ba7f7952..88c1812ed 100644
--- a/yuthon_wechat/models/wecom_apps.py
+++ b/yuthon_wechat/models/wecom_apps.py
@@ -129,5 +129,5 @@ class WeComApps(models.Model):
         else:
             result_data = self.sync_function_api("user_create", "DEPARTMENT_CREATE", data)
         if result_data.get("errcode", None) == 0:
-            return True, result_data.get("errmsg", "")
+            return True, result_data
         return False, result_data.get("errmsg", "")
diff --git a/yuthon_wechat/views/hr_employee_views.xml b/yuthon_wechat/views/hr_employee_views.xml
index 1c7df68d0..3acf4b225 100644
--- a/yuthon_wechat/views/hr_employee_views.xml
+++ b/yuthon_wechat/views/hr_employee_views.xml
@@ -41,11 +41,15 @@
         <field name="model">hr.department</field>
         <field name="inherit_id" ref="hr.view_department_form"/>
         <field name="arch" type="xml">
-             <xpath expr="//form" position="inside">
+             <xpath expr="//sheet" position="before">
                  <header>
                     <button class="oe_stat_button" name="send_wecom_employee" string="同步企业微信部门" groups="hr.group_hr_manager" type="object" icon="fa-bars"/>
                  </header>
             </xpath>
+            <xpath expr="//field[@name='color']" position="after">
+                 <field name="wecom_id" />
+                 <field name="wecom_parent_id" />
+            </xpath>
         </field>
     </record>