Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4

This commit is contained in:
苏竹红
2025-01-15 17:55:04 +08:00

View File

@@ -405,7 +405,11 @@ public class ShopStageInfoDAO {
Example example = new Example(ShopStageInfoDO.class);
example.createCriteria().andEqualTo("lineId", lineId).andEqualTo("shopSubStage", ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage())
.andEqualTo("shopSubStageStatus", ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus());
return shopStageInfoMapper.selectByExample(example);
List<ShopStageInfoDO> shopStageInfos = shopStageInfoMapper.selectByExample(example);
if (CollectionUtils.isEmpty(shopStageInfos)){
return new ArrayList<>();
}
return shopStageInfos;
}
}