From d66de26a3d698670aa62647d7777aba3d2cee104 Mon Sep 17 00:00:00 2001
From: zmyYYDS <864398951@qq.com>
Date: Fri, 22 Dec 2023 20:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=80=E7=89=884.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MetamodelPropertyServiceImpl.java    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java
index ce5add3..8479efd 100644
--- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java
+++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java
@@ -13,6 +13,7 @@ import net.srt.query.MetamodelpropertyQuery;
 import net.srt.service.MetamodelPropertyService;
 import net.srt.vo.MetamodelPropertyVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import srt.cloud.framework.dbswitch.common.util.StringUtil;
 
 import java.util.List;
@@ -29,7 +30,8 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl<MetamodelPrope
     @Override
     public List<MetamodelPropertyVO> properties(Long id) {
         LambdaQueryWrapper<MetamodelPropertyEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MetamodelPropertyEntity::getMetamodelId, id).orderByAsc(MetamodelPropertyEntity::getOrderNo);
+        wrapper.eq(MetamodelPropertyEntity::getMetamodelId, id)
+               .orderByAsc(MetamodelPropertyEntity::getOrderNo);
         return MetamodelPropertyConvert.INSTANCE.convertList(baseMapper.selectList(wrapper));
     }
 
@@ -55,8 +57,8 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl<MetamodelPrope
     private LambdaQueryWrapper<MetamodelPropertyEntity> getWrapper(MetamodelpropertyQuery query) {
         LambdaQueryWrapper<MetamodelPropertyEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(MetamodelPropertyEntity::getMetamodelId, query.getMetamodelId())
-                .like(StringUtil.isBlank(query.getName()), MetamodelPropertyEntity::getName, query.getName())
-                .like(StringUtil.isBlank(query.getCode()), MetamodelPropertyEntity::getCode, query.getCode())
+                .like(StringUtil.isNotBlank(query.getName()), MetamodelPropertyEntity::getName, query.getName())
+                .like(StringUtil.isNotBlank(query.getCode()), MetamodelPropertyEntity::getCode, query.getCode())
                 .orderByAsc(MetamodelPropertyEntity::getOrderNo);
         return wrapper;
     }
@@ -80,13 +82,31 @@ public class MetamodelPropertyServiceImpl extends BaseServiceImpl<MetamodelPrope
 
     @Override
     public void update(MetamodelPropertyVO vo) {
+        // 将MetamodelPropertyVO对象转换为MetamodelPropertyEntity对象
+        MetamodelPropertyEntity entity = MetamodelPropertyConvert.INSTANCE.convert(vo);
 
+        // 设置Builtin为0
+        entity.setBuiltin(0);
+
+        // 设置ProjectId为当前项目Id
+        entity.setProjectId(getProjectId());
+
+        // 根据id更新MetamodelPropertyEntity对象信息
+        updateById(entity);
     }
 
+
+    /**
+     * 删除指定id列表的数据
+     *
+     * @param idList 要删除的数据id列表
+     */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delete(List<Long> idList) {
-
+        removeByIds(idList);
     }
 
 
+
 }