业务电子签章权限调整

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -195,20 +195,25 @@ public class ProjectReportSignatureWorkController extends BaseController {
         }
 
         //获取当前登陆人可申请的签章类型
-        ArrayList<Type> sigTypes = new ArrayList<>();
         String sigTypeList = projectReportSignatureService.getSignatureTypeList(user); //typeList 1:审定单 2:报告
         //type 1:报告  2:审定单
         if (StringUtils.isNotBlank(sigTypeList)){
-            if (typeList.contains(",")){
-                model.addAttribute("isApproval","2");
-                model.addAttribute("isReport","1");
+            if (sigTypeList.contains(",")){
+                String[] split = sigTypeList.split(",");
+                for (String s : split) {
+                    if (s.equals("1")){
+                        model.addAttribute("isApproval","1");
+                    }
+                    if (s.equals("2")){
+                        model.addAttribute("isReport","1");
+                    }
+                }
             }else {
-                if (typeList.equals("1")){
-                    model.addAttribute("isApproval","2");
+                if (sigTypeList.equals("1")){
+                    model.addAttribute("isApproval","1");
                 }
-                if (typeList.equals("2")){
+                if (sigTypeList.equals("2")){
                     model.addAttribute("isReport","1");
-
                 }
             }
         }

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -254,7 +254,7 @@
             {
                 xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"notifyDialogre('审定单签章申请审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.approvalNotifyId +"&home=projectReportSignature','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
             }
-            if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1" && d.isApproval == "2")
+            if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1" && d.isApproval == "1")
             {
                 xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
             }
@@ -623,8 +623,8 @@
                     <c:if test="${isReport == '1'}">
                     ,"isReport":"1"
                     </c:if>
-                    <c:if test="${isApproval == '2'}">
-                    ,"isApproval":"2"
+                    <c:if test="${isApproval == '1'}">
+                    ,"isApproval":"1"
                     </c:if>
                     ,"reportSignatureUrlFlag":"${projectReportSignature.reportSignatureUrlFlag}"
                     ,"reportSignatureContractId":"${projectReportSignature.reportSignatureContractId}"