yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge branch 'apps_dev_CEO_whitelist' into apps_4_test"

Browse Source 
This reverts commit 00f10e26a6, reversing
changes made to 84b63b5bdf.
This commit is contained in:
袁东强 2025-08-03 00:20:18 +08:00 committed by zhaolei
parent 34259470f1
commit 44e920c1f4
2 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
View File

@ -3079,9 +3079,9 @@ public class CoEPALController {
* @return * @return
*/ */
@Mapping("com.actionsoft.apps.coe.pal_processlevel_create_method_list") @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); CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
return web.getPalProcessLevelCreateMethodList(category, methodId); return web.getPalProcessLevelCreateMethodList(category, methodId,fileId);
} }
/** /**

47
com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java
View File

@ -18,7 +18,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.awspaas.user.apps.integration.XmlDatasUtil; import com.awspaas.user.apps.integration.XmlDatasUtil;
import com.awspaas.user.apps.integration.util.HttpClientUtils; import com.awspaas.user.apps.integration.util.HttpClientUtils;
import jodd.util.StringUtil;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
@ -489,26 +488,9 @@ public class TaskListener extends ProcessPubicListener {
sendOaDataPending(taskInstance1,processInst_1,"10036614"); sendOaDataPending(taskInstance1,processInst_1,"10036614");
sendOaDataPending(taskInstance2,processInst_2,"00116580"); sendOaDataPending(taskInstance2,processInst_2,"00116580");
try{
boolean hasProperty = SDK.getAppAPI().hasProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); //挂起流程
String property = ""; SDK.getProcessAPI().suspend(pec.getProcessInstance());
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());
}
}
} }
BO bo1=new BO(); BO bo1=new BO();
bo1.set("PROCESSID",processId); bo1.set("PROCESSID",processId);
@ -560,26 +542,9 @@ public class TaskListener extends ProcessPubicListener {
sendOaDataPending(taskInstance2,processInst_2,"00116580"); sendOaDataPending(taskInstance2,processInst_2,"00116580");
try{
boolean hasProperty = SDK.getAppAPI().hasProperty("com.awspaas.user.apps.yili.integration", "CEO_approval_whitelist"); //挂起流程
String property = ""; SDK.getProcessAPI().suspend(pec.getProcessInstance());
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());
}
}
} }
bo.set("CEO_APPROVE",approve1); bo.set("CEO_APPROVE",approve1);
SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo); SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo);