From bcad3fe1b888ae11d437f6558b7974cfa30cfb2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:24:07 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index 2f72c64..cb752f4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -232,10 +232,7 @@
@Override
public List<Labels> findList(Labels labels) {
-
-
MPJLambdaWrapper<Labels> query = new MPJLambdaWrapper<>();
-
if(labels!=null&&labels.getParentId()!=null){
query.eq(Labels::getParentId,labels.getParentId());
}else{
@@ -248,7 +245,15 @@
}
query.eq(Labels::getIsdeleted,Constants.ZERO);
query.eq(labels.getType()!=null,Labels::getType,labels.getType());
+ query.orderByAsc(Labels::getSortnum);
List<Labels> list= labelsJoinMapper.selectList(query);
+ List<Labels> childList= null;
+ if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+ childList= labelsJoinMapper.selectList(new QueryWrapper<Labels>().lambda()
+ .eq(Labels::getIsdeleted,Constants.ZERO)
+ .eq(Labels::getType,Constants.LabelsType.SERIES_BRAND.getKey())
+ .orderByAsc(Labels::getSortnum));
+ }
for(Labels model:list){
if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())){
//濡傛灉鏄ぇ鍖轰俊鎭紝鏌ヨ鎵�鏈夌粦瀹氶鐪佷唤淇℃伅
@@ -256,6 +261,24 @@
.eq(Areas::getIsdeleted,Constants.ZERO)
.eq(Areas::getBigAreaId,model.getId())));
}
+ if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())
+ &&Constants.equalsInteger(model.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+ //濡傛灉鏄�傚簲鍝佺墝锛屽垯鏌ヨ涓嬬骇绯诲垪
+ model.setChildList(getChildListbyParentId(childList,model.getId()));
+ }
+ }
+ return list;
+ }
+
+ private List<Labels> getChildListbyParentId(List<Labels> childList, Integer id) {
+ List<Labels> list = new ArrayList<>();
+ if(childList!=null && childList.size()>0){
+ for(Labels labels : childList){
+ if(Constants.equalsInteger(labels.getParentId(),id)){
+ list.add(labels);
+ }
+ }
+
}
return list;
}
--
Gitblit v1.9.3