Merge branch 'dev_bussiness_layer0726' into 'develop'

Dev bussiness layer0726

See merge request !285

project-order/src/main/java/com/dituhui/pea/order/controller/BusinessBlockController.java

@@ -64,12 +64,12 @@ public class BusinessBlockController {
 	 * @param id  服务区块ID
 	 * @param id  服务区块ID
 	 * @return
 	 * @return
 	 */
 	 */
-	@PostMapping("/business/service/block/delete")
-	public Result<?> businessServiceBlockDelete(@RequestParam String id) {
+	@PostMapping("/business/service/block/remove")
+	public Result<?> businessServiceBlockRemove(@RequestParam String id) {
 		// 删除服务范围
 		// 删除服务范围
 		Result<?> res = null;
 		Result<?> res = null;
 		try{
 		try{
-			res = businessBlockService.businessServiceBlockDelete(id);
+			res = businessBlockService.businessServiceBlockRemove(id);
 		} catch (BusinessException e){
 		} catch (BusinessException e){
 			return Result.failed(e.getMessage());
 			return Result.failed(e.getMessage());
 		}
 		}

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

@@ -8,7 +8,7 @@ public interface BusinessBlockService {
 
 
 	Result<?> businessServiceBlockAdd(String layerId, String teamId);
 	Result<?> businessServiceBlockAdd(String layerId, String teamId);
 
 
-	Result<?> businessServiceBlockDelete(String blockId);
+	Result<?> businessServiceBlockRemove(String blockId);
 
 
 	Result<?> saasBaseDataLayerUrl(String blockId);
 	Result<?> saasBaseDataLayerUrl(String blockId);
 }
 }

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

@@ -71,6 +71,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 
 
 		Page<MapBlockInfo> pg = new Page<>(page, size);
 		Page<MapBlockInfo> pg = new Page<>(page, size);
 		LambdaQueryWrapper<MapBlockInfo> lqwBlock = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<MapBlockInfo> lqwBlock = new LambdaQueryWrapper<>();
+		lqwBlock.eq(MapBlockInfo::getStatus, 1);
 		lqwBlock.in(MapBlockInfo::getTeamId, teamIds);
 		lqwBlock.in(MapBlockInfo::getTeamId, teamIds);
 		lqwBlock.eq(StringUtils.isNotEmpty(layerId), MapBlockInfo::getLayerId, layerId);
 		lqwBlock.eq(StringUtils.isNotEmpty(layerId), MapBlockInfo::getLayerId, layerId);
 		lqwBlock.orderByAsc(MapBlockInfo::getTeamId);
 		lqwBlock.orderByAsc(MapBlockInfo::getTeamId);
@@ -113,7 +114,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	}
 	}
 
 
 	@Override
 	@Override
-	public Result<?> businessServiceBlockDelete(String blockId) throws BusinessException{
+	public Result<?> businessServiceBlockRemove(String blockId) throws BusinessException{
 		MapBlockInfo block = mapBlockInfoMPDao.getByBlockId(blockId);
 		MapBlockInfo block = mapBlockInfoMPDao.getByBlockId(blockId);
 		if(block == null) {
 		if(block == null) {
 			throw new BusinessException("区块不存在");
 			throw new BusinessException("区块不存在");