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)}
-
+<%--
--%>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 0adec297f..c235f372a 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -110,7 +110,7 @@
${fns:getPermissionByNo('SYS_DICT_ITM_TYPE',intArr)}
-
+ <%--
--%>