Merge branch 'apps_dev_CEO_whitelist' into apps_4_test

# Conflicts:
#	com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

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 , String fileId) {
+	public String getPalProcessLevelCreateMethodList(UserContext me, String category, String methodId) {
 		CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
-		return web.getPalProcessLevelCreateMethodList(category, methodId,fileId);
+		return web.getPalProcessLevelCreateMethodList(category, methodId);
 	}
 
 	/**

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -2611,9 +2611,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
 			plLevel = plModel.getLevel();
 			plOrderIndex = plModel.getOrderIndex();
 			methodId = plModel.getMethodId();
-			if ("freedom.allmethod".equals(methodId)){
-				macroLibraries.put("classification", I18nRes.findValue(CoEConstant.APP_ID, methodId));
-			}
 			for (int i = 0, methodSize = methodModels.size(); i < methodSize; i++) {
 				PALMethodModel palMethodModel = methodModels.get(i);
 				String appId = palMethodModel.getId();
@@ -8667,7 +8664,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 				methodObj.put("categoryName", I18nRes.findValue(CoEConstant.APP_ID, c));
 				methodObj.put("method", model.getId());
 				methodObj.put("methodName", I18nRes.findValue(CoEConstant.APP_ID, model.getId()));
-				if (!"process.yilifreedommodel".equals(model.getId())){
+				if (!"freedom.allmethod".equals(model.getId())){
 					if (model.getSchema().contains("架构KPI图")){
 						methodObj.put("methodName", "架构KPI图");
 					}
@@ -8678,7 +8675,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 				//	System.out.println(c+"对应的"+ PALMethodManager.getInstance().havingCreateMethodPerm(category, methodId, "process", model.getId()));
 
 				//流程入口允许新建表单图和制度图 by金鹏
-				if (model.getId().equals("process.yilifreedommodel")) {
+				if (model.getId().equals("freedom.allmethod")) {
 					if (StringUtils.isBlank(fileId)){
 						methodObj.put("havingCreatePerm", false);
 					}else {

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

@@ -18,6 +18,7 @@ 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;
@@ -488,10 +489,27 @@ 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());
+						}
+					}
+				}
 				BO bo1=new BO();
 				bo1.set("PROCESSID",processId);
 				bo1.set("TASKID",taskId);
@@ -542,10 +560,27 @@ 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());
+						}
+					}
+				}
 				bo.set("CEO_APPROVE",approve1);
 				SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo);
 			}