修复标签循环引用Bug
This commit is contained in:
@@ -3,6 +3,8 @@ package com.adc.da.report.service.impl;
|
|||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import com.adc.da.report.constant.TreeLabelConstants;
|
import com.adc.da.report.constant.TreeLabelConstants;
|
||||||
|
import com.adc.da.report.dao.mysql.ReportLabelDao;
|
||||||
|
import com.adc.da.report.eo.ReportLabelEntity;
|
||||||
import com.adc.da.report.vo.TreeLabelVo;
|
import com.adc.da.report.vo.TreeLabelVo;
|
||||||
import com.adc.da.util.exception.AdcDaBaseException;
|
import com.adc.da.util.exception.AdcDaBaseException;
|
||||||
import com.adc.da.util.utils.StringUtils;
|
import com.adc.da.util.utils.StringUtils;
|
||||||
@@ -14,6 +16,7 @@ import com.adc.da.report.eo.TreeLabelEntity;
|
|||||||
import com.adc.da.report.service.ITreeLabelService;
|
import com.adc.da.report.service.ITreeLabelService;
|
||||||
import com.adc.da.report.dao.mysql.TreeLabelDao;
|
import com.adc.da.report.dao.mysql.TreeLabelDao;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
@@ -34,6 +37,9 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
|
|||||||
@Resource
|
@Resource
|
||||||
private TreeLabelDao treeLabelDao;
|
private TreeLabelDao treeLabelDao;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ReportLabelDao reportLabelDao;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<TreeLabelVo> getTreeLabellist(String like) {
|
public List<TreeLabelVo> getTreeLabellist(String like) {
|
||||||
@@ -109,6 +115,10 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
|
|||||||
treeLabelDao.insert(entity);
|
treeLabelDao.insert(entity);
|
||||||
} else {
|
} else {
|
||||||
//编辑标签
|
//编辑标签
|
||||||
|
//不能设置上级标签为自己
|
||||||
|
if (entity.getParentId().equals(entity.getId())) {
|
||||||
|
throw new AdcDaBaseException("不能设置上级标签为自身");
|
||||||
|
}
|
||||||
TreeLabelEntity treeLabelEntity = treeLabelDao.selectById(entity.getId());
|
TreeLabelEntity treeLabelEntity = treeLabelDao.selectById(entity.getId());
|
||||||
if (Objects.nonNull(treeLabelEntity)) {
|
if (Objects.nonNull(treeLabelEntity)) {
|
||||||
treeLabelDao.updateById(entity);
|
treeLabelDao.updateById(entity);
|
||||||
|
|||||||
Reference in New Issue
Block a user