conflict

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationExtendsMapper.xml

@@ -59,25 +59,25 @@
         reg.MERGER_NAME AS REGION_NAME,
         org.IS_ACTIVE AS IS_ACTIVE
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         LEFT JOIN
-        INDUSTRY AS IND
+        INDUSTRY  IND
         on
         org.INDUSTRY_ID = ind.ID
         LEFT JOIN
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT  BU
         on
         org.BUSINESS_UNIT_ID = bu.ID
         LEFT JOIN
-        AREA AS AREA
+        AREA  AREA
         on
         org.AREA_ID = area.ID
         left JOIN
-        ORGANIZATION_STRUCTURE AS OS
+        ORGANIZATION_STRUCTURE  OS
         on
         org.STRUCTURE_ID = os.ID
         left JOIN
-        REGION AS REG
+        REGION  REG
         on
         org.REGION_ID = reg.ID
         <if test="orgIsActive != null and orgIsActive == true">
@@ -132,21 +132,21 @@
         org.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
         org.IS_ACTIVE AS IS_ACTIVE
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         left JOIN
-        INDUSTRY AS IND
+        INDUSTRY  IND
         on
         org.INDUSTRY_ID = ind.ID
         left JOIN
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT  BU
         on
         org.BUSINESS_UNIT_ID = bu.ID
         left JOIN
-        AREA AS AREA
+        AREA  AREA
         on
         org.AREA_ID = area.ID
         left JOIN
-        ORGANIZATION_STRUCTURE AS OS
+        ORGANIZATION_STRUCTURE  OS
         on
         org.STRUCTURE_ID = os.ID
         <if test="orgIsActive != null and orgIsActive == true ">
@@ -244,21 +244,21 @@
         dv.ID AS DIMENSION_VALUE_ID,
         dv.NAME AS DIMENSION_VALUE_NAME
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         JOIN
-        DIMENSION_VALUE_ORG AS DVG
+        DIMENSION_VALUE_ORG  DVG
         ON
         org.ID = dvg.ORGANIZATION_ID
         JOIN
-        DIMENSION_VALUE AS DV
+        DIMENSION_VALUE  DV
         ON
         dvg.DIMENSION_VALUE_ID = dv.ID
         JOIN
-        DIMENSION AS D
+        DIMENSION  D
         ON
         dv.DIMENSION_ID = d.ID
         JOIN
-        STATISTIC_ATTRIBUTE AS S
+        STATISTIC_ATTRIBUTE  S
         ON
         d.ATTRIBUTE_ID = s.ID
         WHERE
@@ -297,7 +297,7 @@
         org.CREATE_TIME AS CREATE_TIME,
         org.UPDATE_TIME AS UPDATE_TIME
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         where
         org.IS_ACTIVE = 1
 
@@ -311,7 +311,7 @@
         bu.CREATE_TIME AS CREATE_TIME,
         bu.UPDATE_TIME AS UPDATE_TIME
         FROM
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT  BU
         where
         bu.IS_ACTIVE = 1
 
@@ -329,7 +329,7 @@
         )
         AS UPDATE_TIME
         FROM
-        AREA AS AREA
+        AREA
         where
         area.IS_ACTIVE = 1
 
@@ -379,7 +379,7 @@
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         WHERE
         org.IS_ACTIVE = 1
 
@@ -391,7 +391,7 @@
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         WHERE
         org.IS_ACTIVE = 1
 
@@ -403,9 +403,9 @@
         dv.ORGANIZATION_ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        DIMENSION_VALUE_ORG AS DV
+        DIMENSION_VALUE_ORG  DV
         JOIN
-        ORGANIZATION AS ORG
+        ORGANIZATION  ORG
         on
         dv.ORGANIZATION_ID = org.ID
         WHERE
@@ -443,25 +443,25 @@
         ID,
         Name
         FROM
-        ORGANIZATION AS P
+        ORGANIZATION  P
         where
         p.IS_ACTIVE = 1
         )
         AS Q
         JOIN
-        DIMENSION_VALUE_ORG AS DVG
+        DIMENSION_VALUE_ORG  DVG
         on
         q.ID = dvg.ORGANIZATION_ID
         JOIN
-        DIMENSION_VALUE AS DV
+        DIMENSION_VALUE  DV
         on
         dvg.DIMENSION_VALUE_ID = dv.ID
         JOIN
-        DIMENSION AS D
+        DIMENSION  D
         on
         dv.DIMENSION_ID = d.ID
         JOIN
-        STATISTIC_ATTRIBUTE AS S
+        STATISTIC_ATTRIBUTE  S
         on
         d.ATTRIBUTE_ID = s.ID
         where
@@ -540,29 +540,29 @@
         ar.NAME AS AREA_NAME,
         bu.NAME AS BUSINESS_UNIT_NAME
         FROM
-        ORGANIZATION AS M
+        ORGANIZATION  M
         left JOIN
-        INDUSTRY AS N
+        INDUSTRY  N
         on
         m.INDUSTRY_ID = n.ID
         left JOIN
-        REGION AS T
+        REGION  T
         on
         m.REGION_ID = t.ID
         left JOIN
-        REGION AS PREGION
+        REGION  PREGION
         on
         t.PARENT_ID = pregion.ID
         left JOIN
-        AREA AS AR
+        AREA  AR
         on
         m.AREA_ID = ar.ID
         left JOIN
-        ORGANIZATION_STRUCTURE AS S
+        ORGANIZATION_STRUCTURE  S
         on
         m.STRUCTURE_ID = s.ID
         left JOIN
-        BUSINESS_UNIT AS BU
+        BUSINESS_UNIT  BU
         on
         m.BUSINESS_UNIT_ID = bu.ID
         where
@@ -610,35 +610,35 @@
         m.AREA_ID AS AREA_ID,
         m.BUSINESS_UNIT_ID AS BUSINESS_UNIT_ID
         FROM
-        ORGANIZATION AS M
+        ORGANIZATION  M
         LEFT JOIN
-        INDUSTRY AS N
+        INDUSTRY  N
         ON
         m.INDUSTRY_ID = n.ID
         LEFT JOIN
-        ORGANIZATION_SERVICE_TEMP_LATE_GROUP AS STG
+        ORGANIZATION_SERVICE_TEMP_LATE_GROUP  STG
         ON
         m.ID = stg.ORGANIZATION_ID
         LEFT JOIN
-        SERVICE_TYPE AS ST
+        SERVICE_TYPE  ST
         ON
         stg.ORGANIZATION_ID = st.ID
         LEFT JOIN
-        BUSINESS_UNIT AS T
+        BUSINESS_UNIT  T
         ON
         t.IS_ACTIVE = 1
         AND M.BUSINESS_UNIT_ID = t.ID
         LEFT JOIN
-        AREA AS AR
+        AREA  AR
         ON
         ar.IS_ACTIVE = 1
         AND M.AREAID = ar.ID
         LEFT JOIN
-        ENTERPRISE_ACCOUNT_SET_ORG AS SET_ORG
+        ENTERPRISE_ACCOUNT_SET_ORG  SET_ORG
         ON
         m.ID = setOrg.ORGANIZATION_ID
         LEFT JOIN
-        ENTERPRISE_ACCOUNT_SET AS ACC_SET
+        ENTERPRISE_ACCOUNT_SET  ACC_SET
         ON
         accSet.IS_ACTIVE = 1
         AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = accSet.ID