From 552a63aefe454867b26e5965cb89959860734528 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Mon, 2 Apr 2018 12:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=90=8E=E5=8F=B0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E7=BB=86=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8E=E6=9D=A5?= =?UTF-8?q?=E5=87=BD=E9=A1=B5=E9=9D=A2=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/basics/ServiceDictInfoController.java | 2 +- .../com/nis/web/controller/basics/SysDictInfoController.java | 2 +- .../controller/specific/SpecificServiceCfgController.java | 3 ++- src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp | 5 ++++- src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp | 2 +- src/main/webapp/WEB-INF/views/basics/sysDictList.jsp | 2 +- .../webapp/WEB-INF/views/specific/specificServiceCfgList.jsp | 2 +- .../WEB-INF/views/specific/specificServiceHostCfgList.jsp | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index 351045883..beee4ec31 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -125,7 +125,7 @@ public class ServiceDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classificationattribute:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) @RequestMapping(value={"form"}) public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) { if(doAction!=null&&doAction.equals("0")){ diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index fd7ef4ac5..18efeda85 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -121,7 +121,7 @@ public class SysDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit","basics:area:view","basics:isp:view","basics:scope:view"},logical=Logical.OR) @RequestMapping(value={"form"}) public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) { if(doAction!=null&&doAction.equals("0")){ diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index 607705b77..809eefd7e 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -6,6 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -118,7 +119,7 @@ public class SpecificServiceCfgController extends BaseController { * @param mulitId * @return */ - @RequiresPermissions("specific:service:edit") + @RequiresPermissions(value={"specific:service:edit","specific:service:view"},logical=Logical.OR) @RequestMapping(value = { "form" }) public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction) { if(specificServiceCfg!=null&&specificServiceCfg.getSpecServiceId()!=null){ diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 60c264f9b..20d57bbbe 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -124,7 +124,10 @@ }, submitHandler: function(form){ - return errorShow(); + var res = errorShow(); + if(!res){ + return false; + } loading(''); form.submit(); }, diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 34c3b7d68..31a28f180 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -108,7 +108,7 @@ ${fns:getPermissionByNo('SERVICE_DICT_ITM_TYPE',intArr)}