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; } // 职级为空时