diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index e6ddb0c9..bff6ccdb 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java index 99981d2f..2eac8bf5 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java @@ -21,7 +21,7 @@ public class FindProcessAndProofreaderAt extends AbstExpression { if(bo_act_processmanager!=null){ //部门内部校对人 - departmanager = bo_act_processmanager.getString("DEPARTMANAGER"); + departmanager = bo_act_processmanager.getString("DEAPRTMNUM"); } return departmanager; } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index cffe3ce3..b1ac992f 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -3003,7 +3003,7 @@ public class ProcessPublishWeb extends ActionWeb { List fileList = upFileDao.search(" and PALREPOSITORYID ='" + publishId + "'" + " ORDER BY FILENAME ASC"); if (fileList != null && fileList.size() > 0) for (UpfileModel upfileModel : fileList) - if (methodId.contains("data")) { + if (methodId.contains("data") || methodId.contains("control")) { if ("s".equals(upfileModel.getType())) { JSONObject jb = new JSONObject(); //按照附件编号排序