summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangwenqing <[email protected]>2019-04-28 11:44:51 +0800
committerzhangwenqing <[email protected]>2019-04-28 11:44:51 +0800
commit494fb0669a5c87e58c56cf15d74b7dd27d42a147 (patch)
treee58bd261ec4751a3665044a881d4c9341a9e9632
parent36d1fee1415ebfa045bdf68e6a81622b88016fea (diff)
修正saveAndAudit角色用户新增SSL配置失败bug
-rw-r--r--src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java2
-rw-r--r--src/main/java/com/nis/web/service/configuration/MailCfgService.java2
-rw-r--r--src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 5167bf9e2..498df2798 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -305,7 +305,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
- //entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());
+ entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index e2521f654..66b64a8b0 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -317,7 +317,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
- //entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());
+ entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 5ad0f70b2..8c1bd1a43 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -896,7 +896,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
- //entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());
+ entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});