Merge branch 'refs/heads/develop_tzs_bugfix' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/BaseEnterpriseVideoServiceImpl.java

@@ -96,11 +96,12 @@ public class BaseEnterpriseVideoServiceImpl extends BaseService<BaseEnterpriseVi
                 Map<String, Object> artemisInfo = initArtemisConfigAndPath(baseEnterpriseVideo, baseEnterpriseVideo.getUrl());
                 ArtemisConfig config = (ArtemisConfig) artemisInfo.get("config");
                 Map<String, String> path = (Map<String, String>) artemisInfo.get("path");
-
                 JSONObject param = JSONObject.parseObject(baseEnterpriseVideo.getChannelNo());// post请求Form表单参数
                 param.put("cameraIndexCode", video.getKey());
+                log.info("iSecureCenter视频对接平台摄像头预览url,config:{},path:{},param:{}", config, path, param);
                 String body = param.toJSONString();
                 String resultStr = ArtemisHttpUtil.doPostStringArtemis(config, path, body, null, null, "application/json", null);
+                log.info("iSecureCenter视频对接平台摄像头预览url返回结果:{}", resultStr);
                 if (ValidationUtil.isEmpty(resultStr)) {
                     return;
                 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingServiceImpl.java

@@ -266,7 +266,7 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
                 item.setExtraInfo(extraInfo.toJSONString());
                 deleteList.add(item);
             });
-            this.saveBatch(deleteList);
+            this.updateBatchById(deleteList);
         }
     }
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -387,6 +387,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 		if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getOfficeRegion())){
 			List<Integer> officeRegion = new ArrayList<>();
 			for (String s : tzBaseEnterpriseInfo.getOfficeRegion().split("#")) {
+				if (StringUtils.isEmpty(s) || "undefined".equals(s)) {
+					continue;
+				}
 				officeRegion.add(Integer.valueOf(s));
 			}
 			tzBaseEnterpriseInfoDto.setOfficeRegion(officeRegion);
@@ -405,7 +408,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
 			tzBaseEnterpriseInfoDto.setCanEdit("0");
 			tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
-			Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
+			Map<String, Object> resultMap = getAccessFeignResult(creditCode);
 			if (!ValidationUtil.isEmpty(resultMap)) {
 				String area = String.valueOf(resultMap.get("area"));
 				String city = area.substring(0, area.indexOf("市") + 1);
@@ -472,6 +475,16 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return tzBaseEnterpriseInfoDto;
 	}
 
+	private Map<String, Object> getAccessFeignResult(String creditCode) {
+		try {
+			return accessFeignService.getData(creditCode).getResult();
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("获取工商信息失败：accessFeignService.getData(creditCode) error:{}", e.getMessage());
+			return null;
+		}
+	}
+
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyCode) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, companyCode));
@@ -560,7 +573,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 					queryWrapper.eq("use_code",speUseUnit.getCerCode());
 					TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
 
-					Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
+					Map<String, Object> resultMap = getAccessFeignResult(speUseUnit.getCerCode());
 
 					if (ValidationUtil.isEmpty(resultMap)){
 						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){