Antiloveg 8 years ago
parent
commit
70e706f63c

+ 8 - 4
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1218,13 +1218,15 @@
 		a.id,
 		a.name,
 		a.maturity,
-		ui.province,
-		ui.city,
+		dg.name as province,
+		dgg.name as city,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
+	LEFT JOIN district_glossory dg on dg.id = ui.province
+	LEFT JOIN district_glossory dgg on dgg.id = ui.city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0
@@ -1240,13 +1242,15 @@
 		a.id,
 		a.name,
 		a.maturity,
-		oi.licence_province as province,
-		oi.licence_city as city,
+		dg.name as province,
+		dgg.name as city,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN organization_identity oi ON oi.uid = a.owner_id
+	LEFT JOIN district_glossory dg on dg.id = oi.licence_province
+	LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city 
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0

File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html