Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 72faad1ea54670b640c172e3f7efe49f698cf420

 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));
            }
        }