bug修改

无关风月

2 天以前 201c191cc3bc7b68b379e46f3a652aa1efb62837

bug修改

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

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

 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>