diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 47228e19..2702d9e6 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 36931a3f..85e4d80d 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -8029,22 +8029,26 @@ 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 (model.getSchema().contains("架构KPI图")){ + if (model.getSchema().contains("架构KPI图")) { methodObj.put("methodName", "架构KPI图"); } - if (model.getSchema().contains("角色图")){ + if (model.getSchema().contains("角色图")) { methodObj.put("methodName", "角色图"); } - // System.out.println(c+"对应的"+ PALMethodManager.getInstance().havingCreateMethodPerm(category, methodId, "process", model.getId())); + // System.out.println(c+"对应的"+ PALMethodManager.getInstance().havingCreateMethodPerm(category, methodId, "process", model.getId())); - //流程入口允许新建表单图和制度图 by金鹏 - if (category.equals("process")&&model.getSchema().contains("表单图")){ - methodObj.put("havingCreatePerm",true); - }else if (category.equals("process")&&model.getSchema().contains("制度")){ - methodObj.put("havingCreatePerm",true); - }else if(category.equals("org")&&model.getSchema().contains("角色图")) { - methodObj.put("havingCreatePerm",true); - }else if(category.equals("control")&&model.getSchema().contains("制度图")){ + //流程入口允许新建表单图和制度图 by金鹏 + if (category.equals("process") && model.getSchema().contains("表单图")) { + methodObj.put("havingCreatePerm", true); + } else if (category.equals("process") && model.getSchema().contains("制度")) { + methodObj.put("havingCreatePerm", true); + } else if (category.equals("org") && model.getSchema().contains("角色图")) { + methodObj.put("havingCreatePerm", false); + }else if(category.equals("org") && model.getSchema().contains("ORG 组织结构图")){ + methodObj.put("havingCreatePerm", false); + }else if(category.equals("control")&&model.getSchema().contains("制度图")){ + methodObj.put("havingCreatePerm",false); + }else if(category.equals("control")&&model.getSchema().contains("末级流程绩效")){ methodObj.put("havingCreatePerm",false); }else if(model.getId().equals("process.framework")&& !_uc.getUID().equals("admin")){ methodObj.put("havingCreatePerm",false);