mp2jpa

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

@@ -35,9 +35,6 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 
 	@Autowired
-	private MapLayerCustomizeMPDao mapLayerCustomizeMPDao;
-	
-	@Autowired
 	private ISaaSRemoteService saasRemoteService;
 
 	@Autowired
@@ -146,7 +143,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		// 获取layerName
 		MapLayerEntity layer1 = mapLayerDao.getByLayerId(layerId);
 		if(layer1 == null) {
-			MapLayerCustomize layer2 = mapLayerCustomizeMPDao.getByLayerId(layerId);
+			MapLayerCustomizeEntity layer2 = mapLayerCustomizeDao.getByLayerId(layerId);
 			if (layer2 == null) {
 				throw new BusinessException("图层标签不存在");
 			} else {
@@ -292,11 +289,8 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 			return Result.success(items);
 		}
 
-		LambdaQueryWrapper<MapLayerCustomize> lqwLayer = new LambdaQueryWrapper<>();
-		lqwLayer.eq(MapLayerCustomize::getStatus, 1);
-		lqwLayer.in(MapLayerCustomize::getBranchId, new ArrayList<>(branchIds));
-		List<MapLayerCustomize> layerCustomizes = mapLayerCustomizeMPDao.selectList(lqwLayer);
-		for(MapLayerCustomize r: layerCustomizes) {
+		List<MapLayerCustomizeEntity> layerCustomizes = mapLayerCustomizeDao.findByBranchIdInAndStatus(new ArrayList<>(branchIds), 1);
+		for(MapLayerCustomizeEntity r: layerCustomizes) {
 			Map<String, String> m = new HashMap<>();
 			m.put("layerId", r.getLayerId());
 			m.put("layerName", r.getLayer());