diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index b60bc159c..a8b083ba0 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -15,10 +15,12 @@ import org.springframework.transaction.annotation.Transactional; import com.beust.jcommander.internal.Lists; import com.nis.domain.Page; import com.nis.domain.configuration.IpReusePolicyCfg; +import com.nis.domain.configuration.UserManage; import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; +import com.nis.util.StringUtils; import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; @@ -56,8 +58,8 @@ public class IpMultiplexService extends BaseService{ setAreaEffectiveIds(entity); // 获取用户/账号类型 - if(entity.getUserId() != null){ - String userType = ipMultiplexDao.getUserType(entity.getUserId()); + if(StringUtils.isNotBlank(entity.getUserName())){ + String userType = ipMultiplexDao.getUserType(entity.getUserName()); entity.setUserType(userType); } @@ -119,7 +121,7 @@ public class IpMultiplexService extends BaseService{ cfg.setIsAudit(isAudit); cfg.setAuditorId(UserUtils.getUser().getId()); cfg.setAuditTime(auditTime); - cfg.setDoLog(null);; + cfg.setDoLog(null); ipMultiplexDao.updatePolicyCfg(cfg); SysDictInfoService sysDictInfoService = SpringContextHolder.getBean(SysDictInfoService.class); @@ -132,7 +134,7 @@ public class IpMultiplexService extends BaseService{ params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); params.put("userType", cfg.getUserType()); - params.put("userId", cfg.getUserId()); + params.put("userId", keywordsEscape(cfg.getUserName())); params.put("doLog", cfg.getDoLog()); params.put("action", cfg.getAction()); params.put("service", cfg.getServiceId()); @@ -163,7 +165,7 @@ public class IpMultiplexService extends BaseService{ params.put("configId", cfg.getCompileId()); params.put("addrPoolId", cfg.getAddrPoolId()); params.put("userType", cfg.getUserType()); - params.put("userId", cfg.getUserId()); + params.put("userId", keywordsEscape(cfg.getUserName())); params.put("doLog", cfg.getDoLog()); params.put("action", cfg.getAction()); params.put("service", cfg.getServiceId());