修改兴光项目管理简易版添加报告或归档信息权限问题

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

@@ -313,30 +313,30 @@
                 ,{field:'op',align:'center',title:"操作",width:200,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
-                        if(d.canAdd != undefined && d.canAdd =="1")
+                        if(d.canAdd != undefined && d.canAdd =="1" && d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
                         }
-                        if(d.canedit1 != undefined && d.canedit1 =="1")
+                        if(d.canedit1 != undefined && d.canedit1 =="1" && d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
                         }
-                        if(d.canedit2 != undefined && d.canedit2 =="1")
+                        if(d.canedit2 != undefined && d.canedit2 =="1" && d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
                         }
-                        if(d.canrecall != undefined && d.canrecall =="1")
+                        if(d.canrecall != undefined && d.canrecall =="1" && d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
                         }
-                        if(d.cancancel != undefined && d.cancancel =="1")
+                        if(d.cancancel != undefined && d.cancancel =="1" && d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回报告</a>";
                         }
 
 
 						/*归档相关按钮*/
-						if(d.projectReportStatus == 5){
+						if(d.projectReportStatus == 5 && d.canedit3 =="1"){
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增归档信息</a>";
@@ -383,7 +383,7 @@
                     ,"prrId":"${projectRecords.prrId}"
                     ,"procId":"${projectRecords.processInstanceId}"
                     <c:choose>
-                        <c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
+                        <c:when test="${flag == '1' or fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
                                             <c:when test="${projectRecords.projectReportStatus == 0 }">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
@@ -429,18 +429,19 @@
                             </c:choose>
                         </c:when>
                     <c:otherwise>
-                    ,"candel":"0"
+                    ,"canAdd":"0"
+                    ,"recordAdd":"0"
                     ,"canedit1":"0"
                     ,"canedit2":"0"
                     ,"canrecall":"0"
                     ,"cancancel":"0"
-                    ,"recorddel":"0"
                     ,"recordedit1":"0"
                     ,"recordedit2":"0"
                     ,"recordrecall":"0"
                     ,"recordcancel":"0"
                     </c:otherwise>
                     </c:choose>
+                    <shiro:hasPermission name="project:projectRecords:edit">,"canedit3":<c:choose><c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <%--<shiro:hasPermission name="project:projectRecords:edit">
                     ,"canedit3":<c:choose>
                                     <c:when test="${projectRecords.projectReportStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>