From ef269f99c8404ada980b1fc8789d8afe09e00f24 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 19 Mar 2018 14:34:39 +0800 Subject: [PATCH] =?UTF-8?q?0000019:=20=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=E4=B8=93=E9=A1=B9=E7=AE=A1=E7=90=86-=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=201=E3=80=81=E4=B8=93=E9=A1=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E2=80=9D=E5=AE=A1=E6=A0=B8=E6=9C=AA?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E2=80=9C=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BF=A1=E6=81=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E4=B8=BA=E2=80=9D=E6=9C=AA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E2=80=9C=EF=BC=9B=202=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=97=B6=E9=97=B4=E8=BF=87=E7=9F=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=200000018:=20=E6=9D=A5=E5=87=BD=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=201=E3=80=81=E6=9D=A5?= =?UTF-8?q?=E5=87=BD=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E2=80=9D=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87=E2=80=9C=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E6=9D=A5=E5=87=BD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E4=B8=BA=E2=80=9D?= =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8=E2=80=9C=EF=BC=9B=202=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E6=97=B6=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E7=9F=AD=E4=BF=AE=E6=94=B9=200000016:=20=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E4=B8=93=E9=A1=B9=E7=AE=A1=E7=90=86=201?= =?UTF-8?q?=E3=80=81=E4=B8=93=E9=A1=B9=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9A=E4=B8=93=E9=A1=B9=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BF=A1=E6=81=AF=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5is=5Fvalid=3D0,is=5Faudit=3D0=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81=E4=B8=93=E9=A1=B9=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=98=BE=E7=A4=BA=200000017:=20=E6=9D=A5?= =?UTF-8?q?=E5=87=BD=E7=AE=A1=E7=90=86=201=E3=80=81=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=90=8E=EF=BC=8C=E6=9D=A5?= =?UTF-8?q?=E5=87=BD=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=AD=97=E6=AE=B5is=5Fvali?= =?UTF-8?q?d=3D0,is=5Faudit=3D0=EF=BC=9B=202=E3=80=81=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/basics/TaskInfoController.java | 7 +++++++ .../controller/configuration/RequestInfoController.java | 7 +++++++ .../java/com/nis/web/dao/configuration/RequestInfoDao.xml | 6 +++--- .../java/com/nis/web/dao/configuration/TaskInfoDao.xml | 6 +++--- .../java/com/nis/web/service/basics/TaskInfoService.java | 3 ++- .../nis/web/service/configuration/RequestInfoService.java | 3 ++- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 4 ++-- src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp | 6 ++++-- src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 7 ++++--- 9 files changed, 34 insertions(+), 15 deletions(-) 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