fix: 修复layerid为空问题

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java

@@ -168,18 +168,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		OrgGroupEntity group = orgGroupDao.getByGroupId(team.getGroupId());
 		String region = RegionUtils.constructRegion(group.getX(), group.getY());
 		// 获取saas图层id
-		MapLayerEntity layer = mapLayerDao.getByLayerId(layerId);
-		String saasLayerId = null;
-		if (null == layer) {
-			MapLayerCustomizeEntity layerCustom = mapLayerCustomizeDao.findByBranchIdAndLayerId(team.getBranchId(),
-					layerId);
-			if (null == layerCustom) {
-				return Result.failure("图层数据错误");
-			}
-			saasLayerId = layerCustom.getSaasLayerId();
-		} else {
-			saasLayerId = layer.getSaasLayerId();
-		}
+		String saasLayerId = getSaaSLayerId(team.getBranchId(), layerId);
 		if (StringUtils.isEmpty(saasLayerId)) {
 			return Result.failure("图层未配置");
 		}
@@ -198,7 +187,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		block.setBranchId(team.getBranchId());
 		block.setGroupId(team.getGroupId());
 		block.setTeamId(teamId);
-		block.setLayer(layerId);
+		block.setLayerId(layerId);
 		block.setLayer(layerName);
 		block.setStatus(1);
 		mapBlockInfoMPDao.insert(block);
@@ -206,6 +195,25 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		return Result.success(null);
 	}
 
+	/**
+	 * 获取saas图层id
+	 * 
+	 * @param branchId
+	 * @param layerId
+	 * @return
+	 */
+	private String getSaaSLayerId(String branchId, String layerId) {
+		MapLayerEntity layer = mapLayerDao.getByLayerId(layerId);
+		String saasLayerId = null;
+		if (null == layer) {
+			MapLayerCustomizeEntity layerCustom = mapLayerCustomizeDao.findByBranchIdAndLayerId(branchId, layerId);
+			saasLayerId = layerCustom.getSaasLayerId();
+		} else {
+			saasLayerId = layer.getSaasLayerId();
+		}
+		return saasLayerId;
+	}
+
 	@Override
 	public Result<?> businessServiceBlockRemove(String blockId) throws BusinessException {
 		MapBlockInfo block = mapBlockInfoMPDao.getByBlockId(blockId);
@@ -238,9 +246,11 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		String password = "qjOHxpQPXLnJP+Jq1CZGBQ==";
 
 		// 跳转SaaS url
+		// 获取saas图层id
+		String saasLayerId = getSaaSLayerId(block.getBranchId(), block.getLayerId());
 		HashMap<String, String> res = new HashMap<>();
 		res.put("url", url + "/mlAutoLogin?userAccount=" + userAccount + "&password=" + password
-				+ "&jump=basedata&navHidden=true&layerId=" + block.getLayerId() + "&areaId=" + block.getBlockId());
+				+ "&jump=basedata&navHidden=true&layerId=" + saasLayerId + "&areaId=" + block.getBlockId());
 		return Result.success(res);
 	}