diff --git a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java index ec6c3c944..25efaab79 100644 --- a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java +++ b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java @@ -197,6 +197,7 @@ public class ObjectGroupController extends BaseController { } BaseCfg batchCfg = new BaseCfg(); + batchCfg.setTableName(CfgIndexInfo.getTablename()); batchCfg.setIsValid(-1); batchCfg.setIsAudit(0); batchCfg.setEditTime(new Date()); @@ -226,7 +227,7 @@ public class ObjectGroupController extends BaseController { BeanUtils.copyProperties(cfg, baseCfg); baseCfgList.add(baseCfg); } - if(serviceGroupIds.lastIndexOf(",")==(serviceGroupIds.toString().length()-1)){ + if(StringUtils.isNotBlank(serviceGroupIds)&&serviceGroupIds.lastIndexOf(",")==(serviceGroupIds.toString().length()-1)){ serviceGroupIds.deleteCharAt(serviceGroupIds.toString().length()-1); } hasData = objectGroupService.batchDeleteMaatData(page, batchCfg, baseCfgList, hasData,serviceGroupIds.toString()); diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java index 4d2eec948..feb97264c 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -497,14 +497,7 @@ public class ObjectGroupService extends BaseService { List compileIds = new ArrayList(); for(BaseCfg cfg:list){ - if(entity.getServiceId().equals(1028)) { - compileIds.add(Integer.parseInt(cfg.getUserRegion1())); - }else if(entity.getServiceId().equals(400)) { - compileIds.add(cfg.getRegionId()); - }else { - compileIds.add(cfg.getCompileId()); - } - + compileIds.add(cfg.getCompileId()); cfg.setIsValid(-1); cfg.setIsAudit(0); } @@ -516,7 +509,9 @@ public class ObjectGroupService extends BaseService { handelScheduleCfg(list, entity.getTableName(),entity); } //3.恢复policy_group_info可选状态 - policyGroupInfoDao.updateUdFlag(groupIds,1,null); + if(StringUtils.isNotBlank(groupIds)){ + policyGroupInfoDao.updateUdFlag(groupIds,1,null); + } // 4.判断是否是当前检索条件下最后一页数据 并返回结果 page.setList(list); if(page.isLastPage()){ diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index fae808932..c949a14d6 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -125,6 +125,7 @@ function isBatch(url){ || url.indexOf("functionId=512&") > -1 //PXY OBJ FILE || url.indexOf("functionId=215&") > -1 //Proxy Manipulate || url.indexOf("functionId=516&") > -1 //Response Page + || url.indexOf("functionId=888&") > -1 //Object group list ){ flag = true; }