diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index c6b256be..1de022ac 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -3079,9 +3079,9 @@ public class CoEPALController { * @return */ @Mapping("com.actionsoft.apps.coe.pal_processlevel_create_method_list") - public String getPalProcessLevelCreateMethodList(UserContext me, String category, String methodId) { + public String getPalProcessLevelCreateMethodList(UserContext me, String category, String methodId , String fileId) { CoeProcessLevelWeb web = new CoeProcessLevelWeb(me); - return web.getPalProcessLevelCreateMethodList(category, methodId); + return web.getPalProcessLevelCreateMethodList(category, methodId,fileId); } /** diff --git a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java index 5664d81f..b36d032b 100644 --- a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java +++ b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java @@ -18,7 +18,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.awspaas.user.apps.integration.XmlDatasUtil; import com.awspaas.user.apps.integration.util.HttpClientUtils; -import jodd.util.StringUtil; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; @@ -489,26 +488,9 @@ public class TaskListener extends ProcessPubicListener { sendOaDataPending(taskInstance1,processInst_1,"10036614"); sendOaDataPending(taskInstance2,processInst_2,"00116580"); - try{ - boolean hasProperty = SDK.getAppAPI().hasProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); - String property = ""; - if (hasProperty) { - property = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); - } - if (StringUtil.isBlank(property) || !property.contains(pec.getProcessInstance().getId())) { - //挂起流程 - SDK.getProcessAPI().suspend(pec.getProcessInstance()); - } - }catch (Exception e){ - e.printStackTrace(); - logger.info("取消挂起总裁审批流程失败,失败原因:"+e.getMessage()); - try { - SDK.getProcessAPI().suspend(pec.getProcessInstance()); - }catch (Exception e1){ - e1.printStackTrace(); - logger.info("挂起总裁流程失败,失败原因:"+e1.getMessage()); - } - } + + //挂起流程 + SDK.getProcessAPI().suspend(pec.getProcessInstance()); } BO bo1=new BO(); bo1.set("PROCESSID",processId); @@ -560,26 +542,9 @@ public class TaskListener extends ProcessPubicListener { sendOaDataPending(taskInstance2,processInst_2,"00116580"); - try{ - boolean hasProperty = SDK.getAppAPI().hasProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); - String property = ""; - if (hasProperty) { - property = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); - } - if (StringUtil.isBlank(property) || !property.contains(pec.getProcessInstance().getId())) { - //挂起流程 - SDK.getProcessAPI().suspend(pec.getProcessInstance()); - } - }catch (Exception e){ - e.printStackTrace(); - logger.info("取消挂起总裁审批流程失败,失败原因:"+e.getMessage()); - try { - SDK.getProcessAPI().suspend(pec.getProcessInstance()); - }catch (Exception e1){ - e1.printStackTrace(); - logger.info("挂起总裁流程失败,失败原因:"+e1.getMessage()); - } - } + + //挂起流程 + SDK.getProcessAPI().suspend(pec.getProcessInstance()); } bo.set("CEO_APPROVE",approve1); SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo);