BUG 修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -23,6 +23,7 @@
                                      u.sequence_nbr sequenceNbr,
                                      u.biz_org_name bizOrgName,
                                      u.biz_org_code bizOrgCode,
+                                     u.amos_org_id amosOrgId,
                                      u.parent_id parent_id,
                                      g.*
                                  FROM
@@ -94,6 +95,7 @@
             DISTINCT
             u.sequence_nbr sequenceNbr,
             u.biz_org_name bizOrgName,
+            u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
             g.*
             FROM

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -10,7 +10,7 @@
             instance_id,
             date_format(install_date,'%Y-%m-%d') AS installDate,
             date_format(first_maintenance_date,'%Y-%m-%d') AS firstMaintenanceDate,
-            charge_person_name as chargePerson,
+            charge_person as chargePerson,
             (select name from wl_manufacturer_info where id = construction_unit) as constructionUnit,
             (select name from wl_manufacturer_info where id = maintenance_unit) as maintenanceUnit,
             (select name from wl_equipment_category where id = system_type) as systemType,