From 324b77e6d0d763d7da5138ce18c5e3f3534d9075 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 18:02:29 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TModelController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 a2e2e5a..426817f 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
@@ -1,6 +1,7 @@
package com.jilongda.manage.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
@@ -101,16 +102,27 @@
model.setColor(colorList.get(i));
list.add(model);
}else {
+ BeanUtils.copyProperties(dto, list.get(i));
list.get(i).setColor(colorList.get(i));
}
}
}else if (list.size()>colorList.size()){
- list = list.subList(0, colorList.size());
- for (int i = 0; i < colorList.size(); i++) {
- list.get(i).setColor(colorList.get(i));
+ List<TModel> removeList = new ArrayList<>();
+ List<TModel> updateList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ if (i<colorList.size()){
+ updateList.add(list.get(i));
+ list.get(i).setColor(colorList.get(i));
+ }else {
+ removeList.add(list.get(i));
+ }
}
+ list = updateList;
+ modelService.removeByIds(removeList.stream().map(TModel::getId)
+ .collect(Collectors.toList()));
}else {
for (int i = 0; i < list.size(); i++) {
+ BeanUtils.copyProperties(dto, list.get(i));
list.get(i).setColor(colorList.get(i));
}
}
--
Gitblit v1.7.1