IP REUSE POLICY Group Name修改为Group 非空

字典标识删除失败bug更改

src/main/java/com/nis/web/controller/sys/DictController.java

@@ -23,24 +23,17 @@ import com.nis.web.controller.BaseController;
 @RequestMapping(value = "${adminPath}/sys/dict")
 public class DictController extends BaseController {
 	
-
-	@ModelAttribute
-	public SysDataDictionaryName get(@RequestParam(required=false) Integer id) {
-		if (!StringUtil.isEmpty(id)){
-			return dictService.getDictByIdWithRelation(id);
-		}else{
-			return new SysDataDictionaryName();
-		}
-		
-		
-	}
 	
 	@RequiresPermissions("sys:dict:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(SysDataDictionaryName sysDictName,HttpServletRequest request, HttpServletResponse response, Model model) {
+		if(sysDictName ==null){
+			sysDictName=new SysDataDictionaryName();
+		}
 		
 		Page<SysDataDictionaryName> page = dictService.findDictList(new Page<SysDataDictionaryName>(request, response), sysDictName);
         model.addAttribute("page", page);
+        model.addAttribute("sysDataDictionaryName",sysDictName);
        
 		return "/sys/dictList";
 	}
@@ -54,8 +47,14 @@ public class DictController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value={"form"})
-	public String form(SysDataDictionaryName sysDictName, Model model) {
-		
+	public String form(@RequestParam(required=false) Integer id, Model model) {
+		SysDataDictionaryName sysDictName=null;
+		if (!StringUtil.isEmpty(id)){
+			sysDictName= dictService.getDictByIdWithRelation(id);
+		}else{
+			sysDictName=new SysDataDictionaryName();
+		}
+		model.addAttribute("sysDataDictionaryName",sysDictName);
 		return "/sys/dictForm";
 	}