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

project-order/src/main/java/com/dituhui/pea/order/dao/MapBlockInfoDao.java

@@ -18,4 +18,5 @@ public interface MapBlockInfoDao extends JpaRepository<MapBlockInfoEntity, Integ
     
     
     List<MapBlockInfoEntity> findByLayerId(String layerId);
     List<MapBlockInfoEntity> findByLayerId(String layerId);
 
 
+    MapBlockInfoEntity findByTeamIdAndLayerId(String teamId, String layerId);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerCustomizeDao.java

@@ -3,8 +3,14 @@ package com.dituhui.pea.order.dao;
 import com.dituhui.pea.order.entity.MapLayerCustomizeEntity;
 import com.dituhui.pea.order.entity.MapLayerCustomizeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
+import java.util.List;
+
 public interface MapLayerCustomizeDao extends JpaRepository<MapLayerCustomizeEntity, Long> {
 public interface MapLayerCustomizeDao extends JpaRepository<MapLayerCustomizeEntity, Long> {
 
 
 	public MapLayerCustomizeEntity findByBranchIdAndLayerIdAndStatus(String branchId, String layerId, int status);
 	public MapLayerCustomizeEntity findByBranchIdAndLayerIdAndStatus(String branchId, String layerId, int status);
 
 
+	MapLayerCustomizeEntity getByLayerId(String layerId);
+
+	List<MapLayerCustomizeEntity> findByBranchIdInAndStatus(List<String> branchIds, int status);
+
 }
 }