Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -88,7 +88,11 @@
 			resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
 		SELECT
 		*,
-		CONCAT(province,'/',city,'/',district) AS region,
+		TRIM(TRAILING '/' FROM CONCAT(
+			CASE WHEN COALESCE(province, '') <> '' THEN CONCAT(province, '/') ELSE '' END,
+			CASE WHEN COALESCE(city, '') <> '' THEN CONCAT(city, '/') ELSE '' END,
+			CASE WHEN COALESCE(district, '') <> '' THEN CONCAT(district, '/') ELSE '' END
+		)) AS region,
 		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('使用单位')!=-1">
 			(SELECT cdd.name from amos_tzs_biz.cb_data_dictionary cdd WHERE cdd.code = industry_supervisor and cdd.type = 'HYZGBM') AS industrySupervisorName,
 		</if>