diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index e2044434..f40e94c0 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -106,6 +106,10 @@ public class BmsSupplierController { @PostMapping("/page") @PreAuthorize("hasRole('bms:supplier:query')") public R> getPage(@RequestBody BmsSupplier param){ + //兼容 前端接错参数 + param.setName(param.getSupplierName()); + param.setCode(param.getSupplierCode()); + if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ PageUtil.setPageSize(param.getPageSize()+""); PageUtil.setPageNum(param.getPageNum()+""); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 29c4fea5..64bc2fb4 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -257,6 +257,12 @@ public class BmsSupplier implements Serializable { @TableField(exist = false) private Boolean selectUserIdsFlag; + @TableField(exist = false) + private String supplierName; + + @TableField(exist = false) + private String supplierCode; + public List listBizRegionIds(){ List list = new ArrayList<>(); list.add(this.getRegion2First()); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index 1afc8a7f..a7281b36 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -159,7 +159,7 @@ public class BmsChannelPointServiceImpl extends ServiceImpl listByChannelId(Long id) { LambdaQueryWrapper channelPointWrapper = new LambdaQueryWrapper<>(); - channelPointWrapper.eq(BmsChannelPoint::getChannelName,id); + channelPointWrapper.eq(BmsChannelPoint::getChannelId,id); List list = this.list(channelPointWrapper); return list; } diff --git a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java index 2db4d25a..12edf5d4 100644 --- a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java +++ b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java @@ -135,6 +135,7 @@ public class PayPaymentController { if(param.getQueryEndTime()!=null){ lqw.le(PayPayment::getPayTime,param.getQueryEndTime()); } + lqw.orderByDesc(PayPayment::getId); PageUtil.startPage(); List list = payPaymentService.list(lqw); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 28e42997..2e9cdc01 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -127,6 +127,7 @@ public class TbsActivityController { if(param.getPassStartTime()!=null){ lqw.ge(TbsActivity::getCostPassTime,param.getPassStartTime()); } + lqw.orderByDesc(TbsActivity::getId); PageUtil.startPage(); List list = tbsActivityService.list(lqw); for (TbsActivity activity : list) { diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 08124514..21e37115 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -96,6 +96,7 @@ public class VtbVerificationController { }else if(loadMy!=null&&loadMy.equals(1)){ lqw.eq(VtbVerification::getCreateBy,AuthContextUtils.getSysUserId()); } + lqw.orderByDesc(VtbVerification::getId); PageUtil.startPage(); List list = vtbVerificationService.list(lqw); for (VtbVerification verification : list) { diff --git a/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml index a84d8a55..1f014664 100644 --- a/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml @@ -69,7 +69,7 @@ and `bms_supplier_address`.`area` like concat('%',#{query.area},'%') and `bms_supplier_address`.`detail` = #{query.detail} and `bms_supplier_address`.`phone` = #{query.phone} - and `bms_supplier_address`.`receiver` = #{query.receiver} + and `bms_supplier_address`.`receiver` like concat('%',#{query.receiver},'%') and `bms_supplier_address`.`remark` = #{query.remark} and `bms_supplier_address`.`create_time` = #{query.createTime} and `bms_supplier_address`.`update_time` = #{query.updateTime}