Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
chenjinsong
2018-03-22 14:41:33 +08:00
79 changed files with 5111 additions and 2093 deletions

View File

@@ -5,6 +5,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -38,6 +39,7 @@ public class RequestInfoController extends BaseController{
/**
* 进入用户添加或修改页面
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value={"form"})
public String form(RequestInfo requestInfo, Model model) {
TaskInfo taskInfo = new TaskInfo();
@@ -55,6 +57,7 @@ public class RequestInfoController extends BaseController{
/**
* 新增/修改
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
try {
@@ -100,6 +103,7 @@ public class RequestInfoController extends BaseController{
* @param model
* @return
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value = "requestExamine")
public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
@@ -114,6 +118,7 @@ public class RequestInfoController extends BaseController{
* @param model
* @return
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value = "requestExamineNo")
public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
@@ -128,6 +133,7 @@ public class RequestInfoController extends BaseController{
* @param model
* @return
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value = "requestCancelExamine")
public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
@@ -142,6 +148,7 @@ public class RequestInfoController extends BaseController{
* @param model
* @return
*/
@RequiresPermissions("cfg:requestInfo:edit")
@RequestMapping(value = "delete")
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");