瀏覽代碼

满足同步需求而调整

xiari 1 年之前
父節點
當前提交
8df2283234

+ 3 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscounttermController.java

@@ -111,14 +111,14 @@ public class XfDiscounttermController extends BaseController {
     /**
      * 删除折扣设备
      *
-     * @param discountTermIds 主键
+     * @param discountTermIds 设备id
      */
     @SaCheckPermission("consumption:xfDiscountterm:remove")
     @Log(title = "折扣设备", businessType = BusinessType.DELETE)
     @SyncDataToLocal(eventType = DISCOUNT_TERM_REMOVE, sender = XF_DISCOUNT_SENDER)
     @DeleteMapping("/{discountTermIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] discountTermIds) {
-        return toAjax(xfDiscounttermService.deleteWithValidByIds(List.of(discountTermIds), true));
+                          @PathVariable Long[] termIds) {
+        return toAjax(xfDiscounttermService.deleteWithValidByIds(List.of(termIds), true));
     }
 }

+ 6 - 2
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfDiscounttermServiceImpl.java

@@ -163,7 +163,7 @@ public class XfDiscounttermServiceImpl implements IXfDiscounttermService {
     /**
      * 校验并批量删除折扣设备信息
      *
-     * @param ids     待删除的主键集合
+     * @param ids     待删除的设备id集合
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
@@ -172,6 +172,10 @@ public class XfDiscounttermServiceImpl implements IXfDiscounttermService {
         if(isValid){
             //可以删除
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        LambdaQueryWrapper<XfDiscountterm> wrapper = Wrappers.<XfDiscountterm>lambdaQuery();
+        wrapper.in(XfDiscountterm::getTermId, ids);
+        return baseMapper.delete(wrapper) > 0;
     }
+
+
 }