From 3d3ecad7df472390501ed95082e262a4c1746e87 Mon Sep 17 00:00:00 2001 From: lihongyu <504404568@qq.com> Date: Mon, 28 Nov 2022 12:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=A1=A8=E5=8D=95=E6=A8=A1=E5=9E=8B=E5=92=8C=E5=88=B6?= =?UTF-8?q?=E5=BA=A6=E6=A8=A1=E5=9E=8B=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pubEvent/ProcessEndAfterEvent.java | 39 ++++++++----------- .../PALRepositoryQueryAPIManager.java | 2 +- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java index ac47f7b4..73201650 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java @@ -299,32 +299,27 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList } }); // 以下是等线程池的全部线程执行结束后，会自动执行。 - cachedThreadPool.shutdown(); - while (true) { - if (cachedThreadPool.isTerminated()) { - long time = System.currentTimeMillis() - startTime; - //System.out.println("程序结束了，总耗时：" + time + " ms(毫秒)！\n"+toIndex); - break; - } - } + /* + * cachedThreadPool.shutdown(); while (true) { if + * (cachedThreadPool.isTerminated()) { long time = System.currentTimeMillis() - + * startTime; //System.out.println("程序结束了，总耗时：" + time + " ms(毫秒)！\n"+toIndex); + * break; } } + */ } //二次推送 - List List = DBSql.getMaps("SELECT NAME FROM BO_EU_READ_COUNT WHERE PROCESSID = '"+instanceById.getId()+"' AND RESULT = '待处理'"); - if(List.size()!=0) { - System.err.println(instanceById.getTitle()+"批量推送失败后执行二次推送=======>"+List.size()); - for (RowMap rowMap : List) { - try { - ArrayList userList3 = new ArrayList(); - userList3.add(rowMap.getString("NAME")); - //System.err.println(instanceById.getTitle()+"二次推送账号=======>"+userList3); - SendOARead(jsonObject, instanceById, userList3,"单个账号推送"); - } catch (Exception e) { - // TODO: handle exception - } - } - } + /* + * List List = + * DBSql.getMaps("SELECT NAME FROM BO_EU_READ_COUNT WHERE PROCESSID = '" + * +instanceById.getId()+"' AND RESULT = '待处理'"); if(List.size()!=0) { + * System.err.println(instanceById.getTitle()+"批量推送失败后执行二次推送=======>"+List.size( + * )); for (RowMap rowMap : List) { try { ArrayList userList3 = new + * ArrayList(); userList3.add(rowMap.getString("NAME")); + * //System.err.println(instanceById.getTitle()+"二次推送账号=======>"+userList3); + * SendOARead(jsonObject, instanceById, userList3,"单个账号推送"); } catch (Exception + * e) { // TODO: handle exception } } } + */ long endTimes = System.currentTimeMillis(); // 存入日志 createReadLog(processExecutionContext, jsonObject, sendList, startTime, endTimes); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 1d229a7d..b4d0e976 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -4134,7 +4134,7 @@ public class PALRepositoryQueryAPIManager { // 都不为空时 if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm) && UtilString.isNotEmpty(levelPerm)) { - if (getOrgPerm(orgPerm, uc) && getPostPerm(postPerm, uc) && getLevelPerm(levelPerm, uc)) { + if ((getOrgPerm(orgPerm, uc) || getPostPerm(postPerm, uc)) && getLevelPerm(levelPerm, uc)) { return true; } // 职级为空时