From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
index 1309623..0dd3f9f 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemMapper.java
@@ -30,7 +30,9 @@
.eqIfPresent(MdmItemDO::getBrandId, reqVO.getBrandId())
.eqIfPresent(MdmItemDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MdmItemDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(MdmItemDO::getId));
+ .orderByAsc(MdmItemDO::getSort)
+ .orderByDesc(MdmItemDO::getId)
+ .notIn(reqVO.getExcludeIds() != null && !reqVO.getExcludeIds().isEmpty(), MdmItemDO::getId, reqVO.getExcludeIds()));
}
default List<MdmItemDO> selectList(MdmItemPageReqVO reqVO, Collection<Long> categoryIds) {
@@ -40,6 +42,7 @@
.inIfPresent(MdmItemDO::getCategoryId, categoryIds)
.eqIfPresent(MdmItemDO::getItemType, reqVO.getItemType())
.eqIfPresent(MdmItemDO::getStatus, reqVO.getStatus())
+ .orderByAsc(MdmItemDO::getSort)
.orderByDesc(MdmItemDO::getId));
}
@@ -91,4 +94,4 @@
*/
List<Map<String, Object>> selectItemReferenceCount(@Param("itemId") Long itemId);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3