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

dev分支上，自由模型提交回滚

Browse Source
This commit is contained in:
yujh_java 2025-08-01 10:27:47 +08:00
parent b35860647a
commit cb5538f108
2 changed files with 11 additions and 25 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

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

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

@ -2611,9 +2611,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
plLevel = plModel.getLevel(); plLevel = plModel.getLevel();
plOrderIndex = plModel.getOrderIndex(); plOrderIndex = plModel.getOrderIndex();
methodId = plModel.getMethodId(); 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++) { for (int i = 0, methodSize = methodModels.size(); i < methodSize; i++) {
PALMethodModel palMethodModel = methodModels.get(i); PALMethodModel palMethodModel = methodModels.get(i);
String appId = palMethodModel.getId(); String appId = palMethodModel.getId();
@ -8626,7 +8623,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
* @param methodId * @param methodId
* @return * @return
*/ */
public String getPalProcessLevelCreateMethodList(String category, String methodId, String fileId) { public String getPalProcessLevelCreateMethodList(String category, String methodId) {
if(!"process.framework".equals(methodId) && !"default".equals(methodId)){//不是架构，或者文件夹 if(!"process.framework".equals(methodId) && !"default".equals(methodId)){//不是架构，或者文件夹
ResponseObject ro = ResponseObject.newErrResponse(); ResponseObject ro = ResponseObject.newErrResponse();
ro.msg("methodId："+methodId+"当前所选择目录不是文件夹或者流程架构，请选择正确的目录！"); ro.msg("methodId："+methodId+"当前所选择目录不是文件夹或者流程架构，请选择正确的目录！");
@ -8667,29 +8664,18 @@ public class CoeProcessLevelWeb extends ActionWeb {
methodObj.put("categoryName", I18nRes.findValue(CoEConstant.APP_ID, c)); methodObj.put("categoryName", I18nRes.findValue(CoEConstant.APP_ID, c));
methodObj.put("method", model.getId()); methodObj.put("method", model.getId());
methodObj.put("methodName", I18nRes.findValue(CoEConstant.APP_ID, model.getId())); methodObj.put("methodName", I18nRes.findValue(CoEConstant.APP_ID, model.getId()));
if (!"freedom.allmethod".equals(model.getId())){ if (model.getSchema().contains("架构KPI图")) {
if (model.getSchema().contains("架构KPI图")){ methodObj.put("methodName", "架构KPI图");
methodObj.put("methodName", "架构KPI图"); }
} if (model.getSchema().contains("角色图")) {
if (model.getSchema().contains("角色图")){ methodObj.put("methodName", "角色图");
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金鹏 //流程入口允许新建表单图和制度图 by金鹏
if (model.getId().equals("freedom.allmethod")) { if (category.equals("process") && model.getSchema().contains("表单图")) {
if (StringUtils.isBlank(fileId)){ methodObj.put("havingCreatePerm", true);
methodObj.put("havingCreatePerm", false); } else if (category.equals("process") && model.getSchema().contains("制度")) {
}else {
String property = SDK.getAppAPI().getProperty(CoEConstant.APP_ID, "freedom.file");
if (StringUtils.isNotBlank(property)&&property.contains(fileId)){
methodObj.put("havingCreatePerm", true);
}else {
methodObj.put("havingCreatePerm", false);
}
}
}else if (category.equals("process") && model.getSchema().contains("表单图")) {
methodObj.put("havingCreatePerm", true); methodObj.put("havingCreatePerm", true);
} else if (category.equals("process") && model.getSchema().contains("制度")) { } else if (category.equals("process") && model.getSchema().contains("制度")) {
methodObj.put("havingCreatePerm", true); methodObj.put("havingCreatePerm", true);