页面权限

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -394,46 +394,46 @@
                     <c:choose>
                         <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 }">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 }">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2  && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2  && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 }">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 }">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -353,10 +353,10 @@
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
-                    <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">,"candel":	<c:choose><c:when test="${projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canedit2":<c:choose><c:when test="${projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"canedit2":<c:choose><c:when test="${projectRecords.projectStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:when>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -384,10 +384,10 @@
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
-                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:del">,"candel":	<c:choose><c:when test="${projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canedit2":<c:choose><c:when test="${projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"canedit2":<c:choose><c:when test="${projectRecords.projectStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:when>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <html>
 <head>
 	<title>项目列表</title>
@@ -394,46 +395,46 @@
                     <c:choose>
                         <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 }">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 }">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 }">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 }">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>