1.Control Policy审核未通过状态的配置 修改后状态改为未审核 2.IP复用地址池进行审核操作时修改人员/时间不变

This commit is contained in:
zhangwenqing
2018-09-04 16:45:22 +08:00
parent ed8dd56bc3
commit b22211c758
3 changed files with 4 additions and 3 deletions

View File

@@ -158,6 +158,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
} }
}else{ }else{
// 审核未通过状态的配置 修改后状态改为未审核
entity.setIsValid(0);
entity.setIsAudit(0);
entity.setEditorId(UserUtils.getUser().getId()); entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(new Date()); entity.setEditTime(new Date());
websiteCfgDao.updateCfgIndex(entity); websiteCfgDao.updateCfgIndex(entity);

View File

@@ -128,8 +128,6 @@ public class IpMultiplexPoolCfgService extends BaseService{
cfg.setCfgId(Long.valueOf(id)); cfg.setCfgId(Long.valueOf(id));
cfg.setIsValid(isValid); cfg.setIsValid(isValid);
cfg.setIsAudit(isAudit); cfg.setIsAudit(isAudit);
cfg.setEditTime(auditTime);
cfg.setEditorId(UserUtils.getUser().getId());
cfg.setAuditorId(UserUtils.getUser().getId()); cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(auditTime); cfg.setAuditTime(auditTime);
ipMultiplexStrategyDao.update(cfg); ipMultiplexStrategyDao.update(cfg);

View File

@@ -396,7 +396,7 @@
</div> </div>
</div> </div>
</div> </div>
<<c:if test="${cfg.isHexbin==0 }"> <c:if test="${cfg.isHexbin==0 }">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">