diff --git a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java index a74335615..e4951171d 100644 --- a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java +++ b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java @@ -83,12 +83,6 @@ public class CommonGroupManageController extends BaseController { return "redirect:" + adminPath + "/basics/commonGroup/list"; } - @ResponseBody - @RequestMapping(value="ajaxCheckGroupUse") - public boolean ajaxCheckGroupUse(@RequestParam("groupIds")String groupIds){ - return commonGroupManageService.checkIsIssued(groupIds); - } - // 数据导出 @RequestMapping(value = "exportGroup") public void exportGroup(Model model,@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes, diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml index 833e7d1dd..891c7c97a 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml @@ -13,10 +13,11 @@ + r.group_id,r.group_name,r.group_type,r.is_valid,r.create_time,r.edit_time, - r.creator_id,r.editor_id,r.service_group_id,r.description + r.creator_id,r.editor_id,r.service_group_id,r.description, ud_flag diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java index bd663312e..5a2d8a82f 100644 --- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java +++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java @@ -108,49 +108,6 @@ public class CommonGroupManageService extends BaseService{ return list; } - /** - * 删除时校验分组是否被引用,未被引用可删除 - * @param groupIds - * @return false未被引用 / true已被引用 - */ - public boolean checkIsIssued(String groupIds) { - // 组织格式 - Map> map = new HashMap>(); - for(String str : groupIds.split(",")) { - Integer id = Integer.valueOf(str.substring(0, str.indexOf("_"))); - Integer type = Integer.valueOf(str.substring(str.indexOf("_")+1)); - if(map.containsKey(type)) { - Set set = map.get(type); - set.add(id); - map.put(type, set); - }else { - Set set = new HashSet(); - set.add(id); - map.put(type, set); - } - } - - // 根据类型去相应配置查询,若存在被引用的则限制操作 - Set keySet = map.keySet(); - for (Integer type : keySet) { - Set set = map.get(type); - String str = set.toString(); - String ids = str.substring(1, str.indexOf("]")); - if(type == 5) { - List list = ipCommGroupCfgDao.getCfgInfoByGroupIds(ids); - if(list.size() > 0) { - return true; - } - }else if(type == 7) { - List list = urlCommGroupDao.getCfgInfoByGroupIds(ids); - if(list.size() > 0) { - return true; - } - } - } - return false; - } - /** * 更新分组状态 policy_group_info ud_flag:0(无有效的域配置) 1(存在有效的域配置) * @param serviceGroupId diff --git a/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp index c5893c9d9..12d855258 100644 --- a/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp @@ -34,11 +34,16 @@ var checkboxes = $("tbody tr td input.i-checks:checkbox"); var ids = ""; var str = ""; + var canDel = true; checkboxes.each(function(){ if(true == $(this).is(':checked')){ str += $(this).attr("id")+"_"+$(this).attr("groupType")+","; ids += $(this).attr("id")+","; + if($(this).attr("udFlag") != 0){ // 存在被引用的分组 + canDel = false; + return false; + } } }); @@ -51,21 +56,7 @@ } if(str.length >0){ - // 删除时 校验分组是否已被引用,未引用可删除 - var canDel = true; var tip=''; - $.ajax({ - type:'post', - url:'${ctx}/basics/commonGroup/ajaxCheckGroupUse', - data:{"groupIds":str}, - async:false, - success:function(data,textStatus){ - if(data){ - canDel=false; - } - } - }); - if(canDel){ top.$.jBox.confirm("","",function(v,h,f){ if(v=="ok"){ @@ -231,7 +222,7 @@ - +