From 8f6959f3e2846382ffab8efeb80dd2ba0214b74e Mon Sep 17 00:00:00 2001
From: yangsong <yangsong@axzo.cn>
Date: Sat, 7 Oct 2023 17:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=8E=E7=BB=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SaasFeatureApplyDetailDao.java        |  8 +++++++
 .../SaasFeatureApplyDetailService.java        |  4 +---
 .../SaasFeatureApplyDetailServiceImpl.java    | 23 +++++++------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureApplyDetailDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureApplyDetailDao.java
index abf80661..9600afd6 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureApplyDetailDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasFeatureApplyDetailDao.java
@@ -1,9 +1,12 @@
 package cn.axzo.tyr.server.repository.dao;
 
+import java.io.Serializable;
+
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.tyr.server.repository.entity.SaasFeatureApplyDetail;
 import cn.axzo.tyr.server.repository.mapper.SaasFeatureApplyDetailMapper;
 
@@ -15,4 +18,9 @@ import cn.axzo.tyr.server.repository.mapper.SaasFeatureApplyDetailMapper;
  **/
 @Repository
 public class SaasFeatureApplyDetailDao extends ServiceImpl<SaasFeatureApplyDetailMapper, SaasFeatureApplyDetail> {
+    @Override
+    public SaasFeatureApplyDetail getById(Serializable id) {
+        return super.lambdaQuery().eq(SaasFeatureApplyDetail::getId, id)
+                .eq(SaasFeatureApplyDetail::getIsDelete, TableIsDeleteEnum.NORMAL.value).one();
+    }
 }
\ No newline at end of file
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureApplyDetailService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureApplyDetailService.java
index 912e8836..a621f472 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureApplyDetailService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureApplyDetailService.java
@@ -22,9 +22,7 @@ public interface SaasFeatureApplyDetailService {
 
     PermissionPointApplyDetailResp getApplyDetail(Long applyDetailId);
 
-    Void updateApplyDetail(PermissionPointApplyDetailUpdateReq req);
+    void updateApplyDetail(PermissionPointApplyDetailUpdateReq req);
 
     List<PermissionPointApplyDetailResp> getApplyDetails(Long applyId);
-
-    void processAbort(Long applyId);
 }
\ No newline at end of file
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
index bea1284e..5d494af6 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
@@ -9,7 +9,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import cn.axzo.basics.common.BeanMapper;
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
@@ -67,18 +66,18 @@ public class SaasFeatureApplyDetailServiceImpl implements SaasFeatureApplyDetail
     public PermissionPointApplyDetailResp getApplyDetail(Long applyDetailId) {
         SaasFeatureApplyDetail saasFeatureApplyDetail = saasFeatureApplyDetailDao.getById(applyDetailId);
         return BeanMapper.copyBean(saasFeatureApplyDetail, PermissionPointApplyDetailResp.class, (s, p) -> {
-            p.setFitOuTypeList(JSON.parseList(s.getFitOuTypeBit(), Long.class));
-            p.setFitOuNodeTypeList(JSON.parseList(s.getFitOuNodeTypeBit(), Long.class));
+            if (StringUtils.isNotBlank(s.getFitOuTypeBit())) {
+                p.setFitOuTypeList(JSON.parseList(s.getFitOuTypeBit(), Long.class));
+            }
+            if (StringUtils.isNotBlank(s.getFitOuNodeTypeBit())) {
+                p.setFitOuNodeTypeList(JSON.parseList(s.getFitOuNodeTypeBit(), Long.class));
+            }
         });
     }
 
     @Override
-    public Void updateApplyDetail(PermissionPointApplyDetailUpdateReq req) {
-        boolean updated = saasFeatureApplyDetailDao.updateById(BeanMapper.copyBean(req, SaasFeatureApplyDetail.class));
-        if (!updated){
-            throw new ServiceException("更新失败");
-        }
-        return null;
+    public void updateApplyDetail(PermissionPointApplyDetailUpdateReq req) {
+        saasFeatureApplyDetailDao.updateById(BeanMapper.copyBean(req, SaasFeatureApplyDetail.class));
     }
 
     @Override
@@ -92,12 +91,6 @@ public class SaasFeatureApplyDetailServiceImpl implements SaasFeatureApplyDetail
         })).collect(Collectors.toList());
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void processAbort(Long applyId) {
-        // 修改权限点专题
-    }
-
     private List<String> generateCode(String terminal, int maxCode, int maxLength, int size) {
         List<String> result = new ArrayList<>();
         for (int i = 1; i <= size; i++) {