From 28f002d658423647bf18669d20aabac1e75a1219 Mon Sep 17 00:00:00 2001
From: lijiaqi <lijq@ydool.com>
Date: Fri, 6 Sep 2024 17:27:25 +0800
Subject: [PATCH] init

---
 src/main/java/cn/workde/module/drone/coding/entity/Mfc.java  | 2 +-
 .../workde/module/drone/coding/service/AttributeService.java | 5 +++++
 .../cn/workde/module/drone/coding/service/MfcService.java    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/workde/module/drone/coding/entity/Mfc.java b/src/main/java/cn/workde/module/drone/coding/entity/Mfc.java
index 8f753ec..f46acce 100644
--- a/src/main/java/cn/workde/module/drone/coding/entity/Mfc.java
+++ b/src/main/java/cn/workde/module/drone/coding/entity/Mfc.java
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName(value = "dss_drone_coding_batches")
+@TableName(value = "dss_drone_coding_mfc")
 public class Mfc extends BaseEntity {
 
     @Schema(description = "MFC编号")
diff --git a/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java b/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java
index 19b6896..cedcbeb 100644
--- a/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java
+++ b/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.workde.core.base.BaseService;
 import cn.workde.core.data.dto.Result;
+import cn.workde.core.util.SpringUtil;
 import cn.workde.module.drone.coding.dto.AttributeDto;
 import cn.workde.module.drone.coding.entity.Attribute;
 import cn.workde.module.drone.coding.mapper.AttributeMapper;
@@ -27,6 +28,10 @@ public class AttributeService extends BaseService<AttributeMapper, Attribute> {
 
     private String check(String id, AttributeVo vo) {
         String message = "";
+        AttributeClassificationService attributeClassificationService = SpringUtil.getBean(AttributeClassificationService.class);
+        if (ObjUtil.isNull(attributeClassificationService.getById(vo.getAttributeClassificationId()))) {
+            message = " 属性分类不存在 ";
+        }
         long count = this.count(new QueryWrapper<Attribute>()
                 .lambda()
                 .eq(Attribute::getAttributeName, vo.getAttributeName())
diff --git a/src/main/java/cn/workde/module/drone/coding/service/MfcService.java b/src/main/java/cn/workde/module/drone/coding/service/MfcService.java
index ef5e3ce..996f2b6 100644
--- a/src/main/java/cn/workde/module/drone/coding/service/MfcService.java
+++ b/src/main/java/cn/workde/module/drone/coding/service/MfcService.java
@@ -38,6 +38,7 @@ public class MfcService extends BaseService<MfcMapper, Mfc> {
         Long count = this.getBaseMapper().selectCount(new QueryWrapper<Mfc>()
                 .lambda()
                 .eq(Mfc::getMfcCode, vo.getMfcCode())
+                .ne(StrUtil.isNotBlank(id), Mfc::getId, id)
         );
         if (count > 0) {
             message += " MFC编号已存在 ";