From 8636ddf7d5b6a812f85ed68054917c9b62dc2264 Mon Sep 17 00:00:00 2001
From: pengren <pengren0401@ztmarter.com>
Date: Tue, 7 May 2024 14:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DeploymentWhitelistInfoServiceImpl.java  | 15 +++++++++++----
 .../deployment/DeploymentWhitelistListMapper.xml  |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
index bf7b3c8..c302145 100644
--- a/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
+++ b/sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentWhitelistInfoServiceImpl.java
@@ -6,6 +6,7 @@ import com.sf.common.utils.DateUtils;
 import com.sf.system.deployment.domain.DeploymentWhitelistInfo;
 import com.sf.system.deployment.domain.DeploymentWhitelistList;
 import com.sf.system.deployment.mapper.DeploymentWhitelistInfoMapper;
+import com.sf.system.deployment.mapper.DeploymentWhitelistListMapper;
 import com.sf.system.deployment.service.IDeploymentWhitelistInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistInfoService {
     @Autowired
     private DeploymentWhitelistInfoMapper deploymentWhitelistInfoMapper;
+    @Autowired
+    private DeploymentWhitelistListMapper deploymentWhitelistListMapper;
 
     /**
      * 查询白名单列表
@@ -45,7 +48,14 @@ public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistI
      */
     @Override
     public List<DeploymentWhitelistInfo> selectDeploymentWhitelistInfoList(DeploymentWhitelistInfo deploymentWhitelistInfo) {
-        return deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+        List<DeploymentWhitelistInfo> infos = deploymentWhitelistInfoMapper.selectDeploymentWhitelistInfoList(deploymentWhitelistInfo);
+        infos.forEach(deploymentWhitelistInfo1 -> {
+            DeploymentWhitelistList deploymentWhitelistList = new DeploymentWhitelistList();
+            deploymentWhitelistList.setWhitelistId(deploymentWhitelistInfo1.getId());
+            List<DeploymentWhitelistList> list = deploymentWhitelistListMapper.selectDeploymentWhitelistListList(deploymentWhitelistList);
+            deploymentWhitelistInfo1.setDeploymentWhitelistListList(list);
+        });
+        return infos;
     }
 
     /**
@@ -73,9 +83,6 @@ public class DeploymentWhitelistInfoServiceImpl implements IDeploymentWhitelistI
     @Transactional
     @Override
     public int updateDeploymentWhitelistInfo(DeploymentWhitelistInfo deploymentWhitelistInfo) {
-        deploymentWhitelistInfo.setUpdateTime(DateUtils.getNowDate());
-        deploymentWhitelistInfoMapper.deleteDeploymentWhitelistListByWhitelistId(deploymentWhitelistInfo.getId());
-        insertDeploymentWhitelistList(deploymentWhitelistInfo);
         return deploymentWhitelistInfoMapper.updateDeploymentWhitelistInfo(deploymentWhitelistInfo);
     }
 
diff --git a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
index 9229e3b..63868a8 100644
--- a/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
+++ b/sf-system/src/main/resources/mapper/system/deployment/DeploymentWhitelistListMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="user != null "> and user = #{user}</if>
+            <if test="whitelistId != null "> and whitelist_id = #{whitelistId}</if>
         </where>
     </select>