25085 大屏-检验检测-右屏-检验检测机构公示-下钻-充装单位-区域陕西省数据显示后有两个//

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EmergencyBizServiceImpl.java

@@ -127,7 +127,12 @@ public class EmergencyBizServiceImpl {
         jsonData.addAll(dynamicFormAlert);
         // 使用单位信息
         // 获取根据警情获取电梯信息
-        Map<String, Object> map = this.selectByAlertId(id);
+        Map<String, Object> map = new HashMap<>();
+        try {
+            map = this.selectByAlertId(id);
+        }catch (Exception e){
+            return keyinfoData;
+        }
         // 根据设备id 获取使用单位信息
         Map<String, Object> useUnitMap = alertStatisticsMapper.selectUseUnitByAlertId(String.valueOf(map.get("sequenceNbr")));
         if (!ObjectUtils.isEmpty(useUnitMap)) {

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

@@ -89,9 +89,9 @@
 		SELECT
 		*,
 		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
+			CASE WHEN COALESCE(province, '') <![CDATA[<>]]> '' THEN CONCAT(province, '/') ELSE '' END,
+			CASE WHEN COALESCE(city, '') <![CDATA[<>]]>  '' THEN CONCAT(city, '/') ELSE '' END,
+			CASE WHEN COALESCE(district, '') <![CDATA[<>]]>  '' 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,