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

删除提示词优化

Browse Source
This commit is contained in:
yujh_java 2025-07-07 09:51:10 +08:00
parent f98c9e2d7d
commit b59f4448c4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11730,19 +11730,10 @@ public class CoeProcessLevelWeb extends ActionWeb {
PALRepositoryCache.getAllChildrenModelsByPid(model.getWsId(), model.getId(), childList, ids);
removeList.addAll(childList);
for (PALRepositoryModel removeModel : removeList) {
//普通用户不允许删除已发布的文件
if (removeModel.isPublish() && !"admin".equals(_uc.getUID())) {
return ResponseObject.newErrResponse("已发布文件["+ removeModel.getName() + VersionUtil.getVersionStrV(removeModel.getVersion()) + "]不允许删除，请联系系统管理员！").toString();
}
//增加删除逻辑限制 0611 by yujh
//普通用户不允许删除已发停用的文件
if (removeModel.isStop() && !"admin".equals(_uc.getUID())) {
return ResponseObject.newErrResponse("已停用文件["+ removeModel.getName() + VersionUtil.getVersionStrV(removeModel.getVersion()) + "]不允许删除，请联系系统管理员！").toString();
}
//普通用户不允许删除审批中的文件
if (removeModel.isApproval() && !"admin".equals(_uc.getUID())) {
return ResponseObject.newErrResponse("审批中文件["+ removeModel.getName() + VersionUtil.getVersionStrV(removeModel.getVersion()) + "]不允许删除，请联系系统管理员！").toString();
//校验禁止删除逻辑
String errorResponse = checkRemovalPermission(removeModel, _uc);
if (errorResponse != null) {
return errorResponse;
}
}
@ -13241,6 +13232,18 @@ public class CoeProcessLevelWeb extends ActionWeb {
return ro.toString();
}
// 提取重复的错误判断逻辑到一个方法中
private String checkRemovalPermission(PALRepositoryModel model, UserContext _uc) {
if ("admin".equals(_uc.getUID())) {
return null;
}
//非设计状态（即草稿）不允许删除
if (model.isPublish() || model.isStop() || model.isApproval()) {
return ResponseObject.newErrResponse("文件[" + model.getName() + VersionUtil.getVersionStrV(model.getVersion()) + "]非草稿状态不允许删除，请联系系统管理员！").toString();
}
return null;
}
class ComparatorMap implements Comparator<PALRepositoryModel> {
@Override
@ -13252,4 +13255,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
}