diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index dcecd0f64..150f0139b 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -120,7 +120,7 @@ class AppletAttendance(Controller):
                                                                                              '缺卡'] else f'<p style="color:green">{check_out_str}</p>'
         state = "no"
         message = "超出范围或wifi未连接，不允许打卡"
-        address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([])
+        address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([('company_id', '=', employee_id.company_id.id)])
         if kw['att_latitude'] != kw['att_longitude']:
             self_address = self.get_address_from_coords(kw['att_latitude'], kw['att_longitude'])
         else:
diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py
index 58f28df2e..b07c56514 100644
--- a/yuthon_official/__manifest__.py
+++ b/yuthon_official/__manifest__.py
@@ -23,7 +23,7 @@
         'views/yuthon_official_incoming_labor_views.xml',
         'views/yuthon_official_party_views.xml',
         'views/yuthon_official_incoming_party_views.xml',
-        'views/inherit_soong_workflow_insector_views.xml',
+        # 'views/inherit_soong_workflow_insector_views.xml',
         'views/inherit_room_booking_views.xml',
         'views/inherit_issue_library_views.xml',
         'views/official_menus.xml',
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 93279d682..d3c4282c9 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -316,6 +316,20 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="4">
+                        <group>
+                            <field name="tax" readonly="1" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="not_tax_amount" readonly="1" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="first_year_rent" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"/>
+                        </group>
+                    </group>
                      <notebook>
                         <page string="附件">
                             <group col="2">
@@ -335,20 +349,6 @@
                             </group>
                         </page>
                     </notebook>
-                    <group col="4">
-                        <group>
-                            <field name="tax" readonly="1" force_save="1"/>
-                        </group>
-                        <group>
-                            <field name="not_tax_amount" readonly="1" force_save="1"/>
-                        </group>
-                        <group>
-                            <field name="first_year_rent" force_save="1"/>
-                        </group>
-                        <group>
-                            <field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"/>
-                        </group>
-                    </group>
                 </sheet>
             </form>
         </field>
@@ -722,6 +722,21 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="4">
+                        <group>
+                            <field name="tax" readonly="1" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="not_tax_amount" readonly="1" force_save="1"/>
+                        </group>
+                        <group>
+                            <field name="first_year_rent" force_save="1" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"
+                                   readonly="1"/>
+                        </group>
+                    </group>
                      <notebook>
                         <page string="附件">
                             <group col="2">
@@ -748,21 +763,6 @@
                             <field name="contract_date"/>
                         </group>
                     </group>
-                    <group col="4">
-                        <group>
-                            <field name="tax" readonly="1" force_save="1"/>
-                        </group>
-                        <group>
-                            <field name="not_tax_amount" readonly="1" force_save="1"/>
-                        </group>
-                        <group>
-                            <field name="first_year_rent" force_save="1" readonly="1"/>
-                        </group>
-                        <group>
-                            <field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"
-                                   readonly="1"/>
-                        </group>
-                    </group>
                 </sheet>
             </form>
         </field>