From 201c191cc3bc7b68b379e46f3a652aa1efb62837 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 22:11:37 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/service/impl/TModelServiceImpl.java | 1 +
manage/src/main/java/com/jilongda/manage/controller/TModelController.java | 3 ++-
manage/src/main/resources/mapping/TModelMapper.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TModelController.java b/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
index 426817f..8af6127 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
@@ -95,7 +96,7 @@
List<String> colorList = dto.getColorList();
if (list.size()<colorList.size()){
for (int i = 0; i < colorList.size(); i++) {
- if (i>list.size()){
+ if (i>list.size()-1){
TModel model = new TModel();
BeanUtils.copyProperties(dto, model);
model.setId(null);
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TModelServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TModelServiceImpl.java
index 5219d73..a094591 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TModelServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TModelServiceImpl.java
@@ -101,6 +101,7 @@
}
// 查询型号的色号
List<TModel> colorList = this.list(Wrappers.lambdaQuery(TModel.class)
+ .eq(TModel::getBrandId,modelVO.getBrandId())
.eq(TModel::getName,modelVO.getName()));
String color = colorList.stream().map(TModel::getColor).collect(Collectors.joining(","));
modelVO.setColor(color);
diff --git a/manage/src/main/resources/mapping/TModelMapper.xml b/manage/src/main/resources/mapping/TModelMapper.xml
index e2a025d..1b2db7d 100644
--- a/manage/src/main/resources/mapping/TModelMapper.xml
+++ b/manage/src/main/resources/mapping/TModelMapper.xml
@@ -40,7 +40,7 @@
</if>
AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</where>
- GROUP BY `name`
+ GROUP BY `name`,brandId
ORDER BY createTime DESC
</select>
--
Gitblit v1.7.1