diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index 9c30be14e..d3d8a4dc6 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -120,9 +120,9 @@ public class AsnIpController extends BaseController{ } @RequestMapping(value="ajaxIsLast",method=RequestMethod.POST) @ResponseBody - public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds){ - if(StringUtils.isNotBlank(serviceGroupIds)) { - return asnIpCfgService.hasLastIp(serviceGroupIds); + public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds,@RequestParam(required=true,value="ids")String ids){ + if(StringUtils.isNotBlank(serviceGroupIds)&&StringUtils.isNotBlank(ids)) { + return asnIpCfgService.hasLastIp(serviceGroupIds,ids); } return false; } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java index 17f0787d2..9b16b1019 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java @@ -18,5 +18,5 @@ public interface AsnIpCfgDao extends CrudDao{ public List findAllList(AsnIpCfg cfg); public List findPolicyGroupInfosByType(@Param("groupId")Integer groupId); public List findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId); - public List countValidIPs(@Param("ids")String ids); + public List countValidIPs(@Param("groups")String groups,@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index b63525dfd..94e20ea0e 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -387,7 +387,7 @@ select 1 from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) limit 1 \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index b579046a5..5689593e8 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -178,14 +178,17 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { * @param serviceGroupIds * @return */ - public boolean hasLastIp(String serviceGroupIds) { + public boolean hasLastIp(String serviceGroupIds,String ids) { // TODO Auto-generated method stub for(String groupId:serviceGroupIds.split(",")) { Long.parseLong(groupId); } - List countList=asnIpCfgDao.countValidIPs(serviceGroupIds); + List countList=asnIpCfgDao.countValidIPs(serviceGroupIds,ids); + if(countList.size()==0) { + return true; + } for(Integer count:countList) { - if(count==1) { + if(count==0) { return true; } } diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 2fba386a5..3d3e0f246 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -1,283 +1,286 @@ -<%@ tag language="java" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> -<%@ attribute name="id" type="java.lang.String" required="true"%> -<%@ attribute name="url" type="java.lang.String" required="true"%> -<%@ attribute name="label" type="java.lang.String" required="false"%> -<%@ attribute name="maxRow" type="java.lang.Long" required="false"%> - - - - - - - - - - - - - - - - - - - - - - - - - - -<%-- 使用方法: 1.将本tag写在查询的form之前;2.传入table的id和controller的url --%> - \ No newline at end of file