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

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/EnterpriseBizByTCMServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -134,7 +135,24 @@ public class EnterpriseBizByTCMServiceImpl {
         resultMap.remove("regUnitInfoDto");
         resultMap.remove("tzsBaseInstitution");
 
-        resultMap.put("unitAddress", resultMap.get("province") + "/" + resultMap.get("city") + "/" + resultMap.get("district"));
+        String unitAddress = "";
+        if (StrUtil.isNotBlank(resultMap.get("province")+"") && !"null".equals(resultMap.get("province")+"")){
+            unitAddress += resultMap.get("province");
+        }
+        if (StrUtil.isNotBlank(resultMap.get("city")+"") && !"null".equals(resultMap.get("city")+"")){
+            unitAddress += "/" + resultMap.get("city");
+        }
+        if (StrUtil.isNotBlank(resultMap.get("district")+"") && !"null".equals(resultMap.get("district")+"")){
+            unitAddress += "/" + resultMap.get("district");
+        }
+        // 确保不以斜杠开始
+        if (unitAddress.startsWith("/")) {
+            unitAddress = unitAddress.substring(1);
+        }
+
+        if(StrUtil.isNotBlank(unitAddress)) {
+            resultMap.put("unitAddress", unitAddress);
+        }
 
         Map<String,Object> longitudeLatitudeMap = new HashMap<>();
         longitudeLatitudeMap.put("address", resultMap.get("address"));