Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java

@@ -1,24 +1,24 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComCvtCategoryDO;
import com.panzhihua.service_community.service.ComCvtCategoryService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @description:
@@ -50,7 +50,8 @@

    @Override
    public R addComCvtCategory(ComCvtCategoryDTO comCvtCategoryDTO) {
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectOne(new QueryWrapper<ComCvtCategoryDO>().lambda().eq(ComCvtCategoryDO::getName,comCvtCategoryDTO.getName()));
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectOne(
            new QueryWrapper<ComCvtCategoryDO>().lambda().eq(ComCvtCategoryDO::getName, comCvtCategoryDTO.getName()));
        if(null!=comCvtCategoryDO){
            return R.fail("分类名称重复");
        }
@@ -69,7 +70,8 @@
        if(null==old){
            return R.fail("分类不存在");
        }
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectOne(new QueryWrapper<ComCvtCategoryDO>().lambda().eq(ComCvtCategoryDO::getName,comCvtCategoryDTO.getName()));
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectOne(
            new QueryWrapper<ComCvtCategoryDO>().lambda().eq(ComCvtCategoryDO::getName, comCvtCategoryDTO.getName()));
        if(null!=comCvtCategoryDO && !old.getName().equals(comCvtCategoryDO.getName())){
            return R.fail("分类名称重复");
        }
@@ -108,7 +110,8 @@
    @Override
    public R allComCvtCategory() {
        List<ComCvtCategoryVO> comCvtCategoryVOS = new ArrayList<>();
        List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO.selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
        List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO
            .selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
        if (!ObjectUtils.isEmpty(categoryDOS)) {
            categoryDOS.forEach(categoryDO -> {
                ComCvtCategoryVO comCvtCategoryVO=new ComCvtCategoryVO();