Procházet zdrojové kódy

1.修复大中型与资产提成申报列表接口在测试环境报错的问题

GouGengquan před 1 rokem
rodič
revize
f2edac3224

+ 6 - 6
dao/src/main/resources/mapper/CommissionDeclareMapper.xml

@@ -59,8 +59,8 @@
         FROM
         major m
         LEFT JOIN ( SELECT id, NAME, major_id, report_no, created FROM major_production WHERE deleted = 0 ) mp ON m.id = mp.major_id
-        LEFT JOIN USER u ON u.id = m.client_manager_id
-        LEFT JOIN USER u1 ON u1.id = m.principal_id
+        LEFT JOIN `user` u ON u.id = m.client_manager_id
+        LEFT JOIN `user` u1 ON u1.id = m.principal_id
         LEFT JOIN customer_company cc1 ON cc1.id = m.clientele_id
         LEFT JOIN customer_company cc2 ON cc2.id = m.clientele_sub_id
         WHERE
@@ -362,8 +362,8 @@
         FROM
         assets
         LEFT JOIN ( SELECT id, business_id, production_no, create_production_date, created FROM assets_production WHERE deleted = 0 AND production_type != 'STATEMENT' ) ap ON assets.id = ap.business_id
-        LEFT JOIN USER u ON u.id = assets.client_manager_id
-        LEFT JOIN USER u1 ON u1.id = assets.principal_id
+        LEFT JOIN `user` u ON u.id = assets.client_manager_id
+        LEFT JOIN `user` u1 ON u1.id = assets.principal_id
         LEFT JOIN customer_company cc1 ON cc1.id = assets.clientele_id
         LEFT JOIN customer_company cc2 ON cc2.id = assets.clientele_sub_id
         WHERE
@@ -451,8 +451,8 @@
         FROM
         assets
         LEFT JOIN ( SELECT id, business_id, production_no, create_production_date, created FROM assets_production WHERE production_type!='STATEMENT' AND deleted = 0 ) ap ON assets.id = ap.business_id
-        LEFT JOIN USER u ON u.id = assets.client_manager_id
-        LEFT JOIN USER u1 ON u1.id = assets.principal_id
+        LEFT JOIN `user` u ON u.id = assets.client_manager_id
+        LEFT JOIN `user` u1 ON u1.id = assets.principal_id
         LEFT JOIN customer_company cc1 ON cc1.id = assets.clientele_id
         LEFT JOIN customer_company cc2 ON cc2.id = assets.clientele_sub_id
         WHERE