diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java index 833261737..53fd00d7f 100644 --- a/src/main/java/com/nis/web/controller/sys/DictController.java +++ b/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 page = dictService.findDictList(new Page(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"; } diff --git a/src/main/java/com/nis/web/dao/SysDictDao.xml b/src/main/java/com/nis/web/dao/SysDictDao.xml index 0d96f59b0..70fc29efa 100644 --- a/src/main/java/com/nis/web/dao/SysDictDao.xml +++ b/src/main/java/com/nis/web/dao/SysDictDao.xml @@ -145,7 +145,6 @@ mark = #{mark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR}, revision = #{revision,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, modify_time = #{modifyTime,jdbcType=TIMESTAMP}, status = #{status,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index 291964ef9..a9a86679e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -166,10 +166,11 @@ $(function(){
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 7fba8bea3..a45b99a94 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -296,7 +296,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index e8270c021..2677f016c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -90,7 +90,7 @@ - +
@@ -262,7 +262,7 @@ <%-- --%> - + <%-- diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp index 9616e115d..a75faf449 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp @@ -41,7 +41,6 @@ }, submitHandler: function(form){ - if(!validateItem()) { return false; }