融合代码 提交本地

src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java

@@ -46,7 +46,7 @@ public class SpecificServiceCfgController extends BaseController {
 	 * @param model
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:view")
+	@RequiresPermissions("specific:service:view")
 	@RequestMapping(value = "list")
 	public String list(SpecificServiceCfg specificServiceCfg, HttpServletRequest request, HttpServletResponse response,
 			Model model) {
@@ -83,7 +83,7 @@ public class SpecificServiceCfgController extends BaseController {
 			page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize())));
 		}
 		model.addAttribute("page", page);
-		// 删除顶层数据、取出id 优化处理
+		// 删除顶层数据、取出id 
 		List<Integer> intList = Lists.newArrayList();
 		for (SpecificServiceCfg tempSS : page.getList()) {
 			if (tempSS != null) {
@@ -118,6 +118,7 @@ public class SpecificServiceCfgController extends BaseController {
 	 * @param mulitId
 	 * @return
 	 */
+	@RequiresPermissions("specific:service:edit")
 	@RequestMapping(value = { "form" })
 	public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction, String mulitId) {
 		
@@ -150,7 +151,7 @@ public class SpecificServiceCfgController extends BaseController {
 	 * @param redirectAttributes
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:edit")
+	@RequiresPermissions("specific:service:edit")
 	@RequestMapping(value="saveOrUpdate")
 	public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model,
 			RedirectAttributes redirectAttributes,Integer oldId) {
@@ -171,6 +172,7 @@ public class SpecificServiceCfgController extends BaseController {
 	 * @param mulitId
 	 * @return
 	 */
+	@RequiresPermissions("specific:service:edit")
 	@RequestMapping(value="delete")
 	public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
 		try{