Commit 1b37c47361c58754a0d567a9f58979fe3143c7e8
1 parent
5caf9909
fix: deleteBatchIds 已过期
Showing
23 changed files
with
26 additions
and
27 deletions
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatConversationServiceImpl.java
| ... | ... | @@ -162,7 +162,7 @@ public class AiChatConversationServiceImpl implements AiChatConversationService |
| 162 | 162 | if (CollUtil.isEmpty(list)) { |
| 163 | 163 | return; |
| 164 | 164 | } |
| 165 | - chatConversationMapper.deleteBatchIds(convertList(list, AiChatConversationDO::getId)); | |
| 165 | + chatConversationMapper.deleteByIds(convertList(list, AiChatConversationDO::getId)); | |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | @Override | ... | ... |
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java
| ... | ... | @@ -339,7 +339,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { |
| 339 | 339 | throw exception(CHAT_MESSAGE_NOT_EXIST); |
| 340 | 340 | } |
| 341 | 341 | // 2. 执行删除 |
| 342 | - chatMessageMapper.deleteBatchIds(convertList(messages, AiChatMessageDO::getId)); | |
| 342 | + chatMessageMapper.deleteByIds(convertList(messages, AiChatMessageDO::getId)); | |
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | @Override | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
| ... | ... | @@ -180,7 +180,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { |
| 180 | 180 | businessProductMapper.updateBatch(diffList.get(1)); |
| 181 | 181 | } |
| 182 | 182 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 183 | - businessProductMapper.deleteBatchIds(convertSet(diffList.get(2), CrmBusinessProductDO::getId)); | |
| 183 | + businessProductMapper.deleteByIds(convertSet(diffList.get(2), CrmBusinessProductDO::getId)); | |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
| ... | ... | @@ -100,7 +100,7 @@ public class CrmBusinessStatusServiceImpl implements CrmBusinessStatusService { |
| 100 | 100 | businessStatusMapper.updateBatch(diffList.get(1)); |
| 101 | 101 | } |
| 102 | 102 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 103 | - businessStatusMapper.deleteBatchIds(convertSet(diffList.get(2), CrmBusinessStatusDO::getId)); | |
| 103 | + businessStatusMapper.deleteByIds(convertSet(diffList.get(2), CrmBusinessStatusDO::getId)); | |
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
| ... | ... | @@ -175,7 +175,7 @@ public class CrmContractServiceImpl implements CrmContractService { |
| 175 | 175 | contractProductMapper.updateBatch(diffList.get(1)); |
| 176 | 176 | } |
| 177 | 177 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 178 | - contractProductMapper.deleteBatchIds(convertSet(diffList.get(2), CrmContractProductDO::getId)); | |
| 178 | + contractProductMapper.deleteByIds(convertSet(diffList.get(2), CrmContractProductDO::getId)); | |
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
| ... | ... | @@ -255,7 +255,7 @@ public class CrmPermissionServiceImpl implements CrmPermissionService { |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | // 删除数据权限 |
| 258 | - permissionMapper.deleteBatchIds(convertSet(permissions, CrmPermissionDO::getId)); | |
| 258 | + permissionMapper.deleteByIds(convertSet(permissions, CrmPermissionDO::getId)); | |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | @Override |
| ... | ... | @@ -286,7 +286,7 @@ public class CrmPermissionServiceImpl implements CrmPermissionService { |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | // 删除数据权限 |
| 289 | - permissionMapper.deleteBatchIds(ids); | |
| 289 | + permissionMapper.deleteByIds(ids); | |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | @Override | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
| ... | ... | @@ -189,7 +189,7 @@ public class ErpFinancePaymentServiceImpl implements ErpFinancePaymentService { |
| 189 | 189 | financePaymentItemMapper.updateBatch(diffList.get(1)); |
| 190 | 190 | } |
| 191 | 191 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 192 | - financePaymentItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpFinancePaymentItemDO::getId)); | |
| 192 | + financePaymentItemMapper.deleteByIds(convertList(diffList.get(2), ErpFinancePaymentItemDO::getId)); | |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | // 第三步,更新采购入库、退货的付款金额情况 |
| ... | ... | @@ -230,7 +230,7 @@ public class ErpFinancePaymentServiceImpl implements ErpFinancePaymentService { |
| 230 | 230 | financePaymentMapper.deleteById(payment.getId()); |
| 231 | 231 | // 2.2 删除付款单项 |
| 232 | 232 | List<ErpFinancePaymentItemDO> paymentItems = financePaymentItemMapper.selectListByPaymentId(payment.getId()); |
| 233 | - financePaymentItemMapper.deleteBatchIds(convertSet(paymentItems, ErpFinancePaymentItemDO::getId)); | |
| 233 | + financePaymentItemMapper.deleteByIds(convertSet(paymentItems, ErpFinancePaymentItemDO::getId)); | |
| 234 | 234 | |
| 235 | 235 | // 2.3 更新采购入库、退货的付款金额情况 |
| 236 | 236 | updatePurchasePrice(paymentItems); | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
| ... | ... | @@ -189,7 +189,7 @@ public class ErpFinanceReceiptServiceImpl implements ErpFinanceReceiptService { |
| 189 | 189 | financeReceiptItemMapper.updateBatch(diffList.get(1)); |
| 190 | 190 | } |
| 191 | 191 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 192 | - financeReceiptItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpFinanceReceiptItemDO::getId)); | |
| 192 | + financeReceiptItemMapper.deleteByIds(convertList(diffList.get(2), ErpFinanceReceiptItemDO::getId)); | |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | // 第三步,更新销售出库、退货的收款金额情况 |
| ... | ... | @@ -230,7 +230,7 @@ public class ErpFinanceReceiptServiceImpl implements ErpFinanceReceiptService { |
| 230 | 230 | financeReceiptMapper.deleteById(receipt.getId()); |
| 231 | 231 | // 2.2 删除收款单项 |
| 232 | 232 | List<ErpFinanceReceiptItemDO> receiptItems = financeReceiptItemMapper.selectListByReceiptId(receipt.getId()); |
| 233 | - financeReceiptItemMapper.deleteBatchIds(convertSet(receiptItems, ErpFinanceReceiptItemDO::getId)); | |
| 233 | + financeReceiptItemMapper.deleteByIds(convertSet(receiptItems, ErpFinanceReceiptItemDO::getId)); | |
| 234 | 234 | |
| 235 | 235 | // 2.3 更新销售出库、退货的收款金额情况 |
| 236 | 236 | updateSalePrice(receiptItems); | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
| ... | ... | @@ -232,7 +232,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { |
| 232 | 232 | purchaseInItemMapper.updateBatch(diffList.get(1)); |
| 233 | 233 | } |
| 234 | 234 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 235 | - purchaseInItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpPurchaseInItemDO::getId)); | |
| 235 | + purchaseInItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseInItemDO::getId)); | |
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
| ... | ... | @@ -183,7 +183,7 @@ public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService { |
| 183 | 183 | purchaseOrderItemMapper.updateBatch(diffList.get(1)); |
| 184 | 184 | } |
| 185 | 185 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 186 | - purchaseOrderItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpPurchaseOrderItemDO::getId)); | |
| 186 | + purchaseOrderItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseOrderItemDO::getId)); | |
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
| ... | ... | @@ -228,7 +228,7 @@ public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService { |
| 228 | 228 | purchaseReturnItemMapper.updateBatch(diffList.get(1)); |
| 229 | 229 | } |
| 230 | 230 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 231 | - purchaseReturnItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpPurchaseReturnItemDO::getId)); | |
| 231 | + purchaseReturnItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseReturnItemDO::getId)); | |
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
| ... | ... | @@ -195,7 +195,7 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService { |
| 195 | 195 | saleOrderItemMapper.updateBatch(diffList.get(1)); |
| 196 | 196 | } |
| 197 | 197 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 198 | - saleOrderItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpSaleOrderItemDO::getId)); | |
| 198 | + saleOrderItemMapper.deleteByIds(convertList(diffList.get(2), ErpSaleOrderItemDO::getId)); | |
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
| ... | ... | @@ -240,7 +240,7 @@ public class ErpSaleOutServiceImpl implements ErpSaleOutService { |
| 240 | 240 | saleOutItemMapper.updateBatch(diffList.get(1)); |
| 241 | 241 | } |
| 242 | 242 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 243 | - saleOutItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpSaleOutItemDO::getId)); | |
| 243 | + saleOutItemMapper.deleteByIds(convertList(diffList.get(2), ErpSaleOutItemDO::getId)); | |
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java
| ... | ... | @@ -240,7 +240,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService { |
| 240 | 240 | saleReturnItemMapper.updateBatch(diffList.get(1)); |
| 241 | 241 | } |
| 242 | 242 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 243 | - saleReturnItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpSaleReturnItemDO::getId)); | |
| 243 | + saleReturnItemMapper.deleteByIds(convertList(diffList.get(2), ErpSaleReturnItemDO::getId)); | |
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java
| ... | ... | @@ -169,7 +169,7 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService { |
| 169 | 169 | stockCheckItemMapper.updateBatch(diffList.get(1)); |
| 170 | 170 | } |
| 171 | 171 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 172 | - stockCheckItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockCheckItemDO::getId)); | |
| 172 | + stockCheckItemMapper.deleteByIds(convertList(diffList.get(2), ErpStockCheckItemDO::getId)); | |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java
| ... | ... | @@ -165,7 +165,7 @@ public class ErpStockInServiceImpl implements ErpStockInService { |
| 165 | 165 | stockInItemMapper.updateBatch(diffList.get(1)); |
| 166 | 166 | } |
| 167 | 167 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 168 | - stockInItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockInItemDO::getId)); | |
| 168 | + stockInItemMapper.deleteByIds(convertList(diffList.get(2), ErpStockInItemDO::getId)); | |
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java
| ... | ... | @@ -166,7 +166,7 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService { |
| 166 | 166 | stockMoveItemMapper.updateBatch(diffList.get(1)); |
| 167 | 167 | } |
| 168 | 168 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 169 | - stockMoveItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockMoveItemDO::getId)); | |
| 169 | + stockMoveItemMapper.deleteByIds(convertList(diffList.get(2), ErpStockMoveItemDO::getId)); | |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | ... | ... |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java
| ... | ... | @@ -165,7 +165,7 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { |
| 165 | 165 | stockOutItemMapper.updateBatch(diffList.get(1)); |
| 166 | 166 | } |
| 167 | 167 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 168 | - stockOutItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockOutItemDO::getId)); | |
| 168 | + stockOutItemMapper.deleteByIds(convertList(diffList.get(2), ErpStockOutItemDO::getId)); | |
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | ... | ... |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
| ... | ... | @@ -204,7 +204,7 @@ public class CodegenServiceImpl implements CodegenService { |
| 204 | 204 | codegenColumnMapper.insertBatch(columns); |
| 205 | 205 | // 4.2 删除不存在的字段 |
| 206 | 206 | if (CollUtil.isNotEmpty(deleteColumnIds)) { |
| 207 | - codegenColumnMapper.deleteBatchIds(deleteColumnIds); | |
| 207 | + codegenColumnMapper.deleteByIds(deleteColumnIds); | |
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | 210 | ... | ... |
yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
| ... | ... | @@ -248,7 +248,7 @@ public class ProductSkuServiceImpl implements ProductSkuService { |
| 248 | 248 | updateSkus.forEach(sku -> productSkuMapper.updateById(sku)); |
| 249 | 249 | } |
| 250 | 250 | if (CollUtil.isNotEmpty(existsSkuMap)) { |
| 251 | - productSkuMapper.deleteBatchIds(existsSkuMap.values()); | |
| 251 | + productSkuMapper.deleteByIds(existsSkuMap.values()); | |
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | ... | ... |
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java
| ... | ... | @@ -98,7 +98,7 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla |
| 98 | 98 | expressTemplateFreeMapper.updateBatch(diffList.get(1)); |
| 99 | 99 | } |
| 100 | 100 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 101 | - expressTemplateFreeMapper.deleteBatchIds(convertList(diffList.get(2), DeliveryExpressTemplateFreeDO::getId)); | |
| 101 | + expressTemplateFreeMapper.deleteByIds(convertList(diffList.get(2), DeliveryExpressTemplateFreeDO::getId)); | |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| ... | ... | @@ -122,7 +122,7 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla |
| 122 | 122 | expressTemplateChargeMapper.updateBatch(diffList.get(1)); |
| 123 | 123 | } |
| 124 | 124 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
| 125 | - expressTemplateChargeMapper.deleteBatchIds(convertList(diffList.get(2), DeliveryExpressTemplateChargeDO::getId)); | |
| 125 | + expressTemplateChargeMapper.deleteByIds(convertList(diffList.get(2), DeliveryExpressTemplateChargeDO::getId)); | |
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | ... | ... |
yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/service/tag/MpTagServiceImpl.java
| ... | ... | @@ -157,7 +157,7 @@ public class MpTagServiceImpl implements MpTagService { |
| 157 | 157 | }); |
| 158 | 158 | // 情况三,部分标签已经不存在了,删除 |
| 159 | 159 | if (CollUtil.isNotEmpty(tagMap)) { |
| 160 | - mpTagMapper.deleteBatchIds(convertList(tagMap.values(), MpTagDO::getId)); | |
| 160 | + mpTagMapper.deleteByIds(convertList(tagMap.values(), MpTagDO::getId)); | |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
| ... | ... | @@ -12,7 +12,6 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 12 | 12 | import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; |
| 13 | 13 | import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; |
| 14 | 14 | import cn.iocoder.yudao.module.infra.api.config.ConfigApi; |
| 15 | -import cn.iocoder.yudao.module.infra.api.file.FileApi; | |
| 16 | 15 | import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthRegisterReqVO; |
| 17 | 16 | import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; |
| 18 | 17 | import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; | ... | ... |