diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index a8f120e5f..3efb973bf 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -439,13 +439,13 @@ order by a.verification_time desc, a.id desc - order by a.appt_use_date desc, a.hour_type asc, a.id desc + order by a.appt_use_date desc, a.pay_time desc, a.id desc order by a.update_time desc, a.id desc - order by a.create_time desc, a.user_id desc + order by a.appt_use_date desc, a.pay_time desc, a.id desc diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java index b59373630..d6fb7a5c6 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java @@ -140,9 +140,11 @@ public class WalletManageController { } private R> listWalletByIds(List walletIds) { + // 内部接口无用户凭证,不能走依赖 UPMS 数据权限的 scopeList; + // 钱包主键已由调用方业务记录过滤,这里直接按主键联查钱包类型返回。 WalletManageDto dto = new WalletManageDto(); dto.setWalletIds(walletIds); - List wallet = walletManageService.scopeList(dto, null); + List wallet = walletManageMapper.joinList(dto); if (ObjectUtil.isEmpty(wallet)) return R.failed("钱包不存在"); return R.ok(wallet); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java index 4bd7c9ae3..b3f87d637 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java @@ -134,6 +134,7 @@ public interface WalletManageMapper extends PjcloudBaseMapper