diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index 6b30fd483..ca89c515f 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -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; @@ -37,6 +38,7 @@ public class TaskInfoController extends BaseController{ /** * 进入用户添加或修改页面 */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value={"form"}) public String form(TaskInfo taskInfo, Model model) { if(taskInfo.getId()!=null){ @@ -51,6 +53,7 @@ public class TaskInfoController extends BaseController{ /** * 新增/修改 */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { try { @@ -96,6 +99,7 @@ public class TaskInfoController extends BaseController{ * @param model * @return */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value = "taskExamine") public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); @@ -110,6 +114,7 @@ public class TaskInfoController extends BaseController{ * @param model * @return */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value = "taskExamineNo") public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); @@ -124,6 +129,7 @@ public class TaskInfoController extends BaseController{ * @param model * @return */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value = "taskCancelExamine") public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); @@ -138,6 +144,7 @@ public class TaskInfoController extends BaseController{ * @param model * @return */ + @RequiresPermissions("basics:taskInfo:edit") @RequestMapping(value = "delete") public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index c20c7c975..0fb3745cf 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -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(","); diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 71979abec..d62fdd6d3 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -47,7 +47,7 @@ left join sys_user u on r.editor_id=u.id left join sys_user e on r.auditor_id=e.id left join task_info t on r.task_id=t.id - where r.is_valid=1 and r.is_audit !=3 + where r.is_valid!=-1 and r.is_audit !=3 AND r.request_title like CONCAT('%',#{requestTitle}, '%') @@ -68,7 +68,7 @@ AND r.edit_time between #{dobeginDate} and #{doendDate} - order by r.request_time desc + order by r.create_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 683e8561a..31cd25671 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -25,7 +25,7 @@ select from task_info t - where is_valid=1 and is_audit !=3 + where is_valid!=-1 and is_audit !=3 AND id = #{id,jdbcType=BIGINT} @@ -50,7 +50,7 @@ left join sys_user s on r.creator_id=s.id left join sys_user u on r.editor_id=u.id left join sys_user e on r.auditor_id=e.id - where r.is_valid=1 and r.is_audit !=3 + where r.is_valid!=-1 and r.is_audit !=3 AND r.task_name like CONCAT('%',#{taskName}, '%') @@ -64,7 +64,7 @@ AND r.edit_time between #{dobeginDate} and #{doendDate} - order by r.task_time desc + order by r.create_time desc