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 e0be7140..963e05cd 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 9b2b4ef3..3193826d 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 @@ -7851,7 +7851,7 @@ public class CoeProcessLevelWeb extends ActionWeb { // 组织下的内容不在【架构筛选】功能的影响内 if (!("org".equals(((JSONObject)model).getString("plCategory")) || "itsystem.normal".equals(((JSONObject)model).getString("plMethodId")))) { if ("process.framework".equals(((JSONObject)model).getString("plMethodId")) || "default".equals(((JSONObject)model).getString("plMethodId"))){ - flag = this.filterEmptyMoldel(((JSONObject)model).getString("wsId"),((JSONObject)model).getString("currId")); + flag = this.filterEmptyMoldel(((JSONObject)model).getString("wsId"),((JSONObject)model).getString("versionId")); } } return flag; @@ -7867,7 +7867,7 @@ public class CoeProcessLevelWeb extends ActionWeb { boolean flag = false; if ("process.framework".equals(((JSONObject)item).getString("plMethodId")) || "default".equals(((JSONObject)item).getString("plMethodId"))){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterChildLevelModelByPid(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("currId"),methodIdList); + flag = this.filterChildLevelModelByPid(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("versionId"),methodIdList); }else { flag = methodIdList.contains(((JSONObject)item).getString("plMethodId")); } @@ -7885,7 +7885,7 @@ public class CoeProcessLevelWeb extends ActionWeb { boolean flag = false; if ("process.framework".equals(((JSONObject)item).getString("plMethodId")) || "default".equals(((JSONObject)item).getString("plMethodId"))){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterIsMatchRepositoryByCreateUser(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("currId"),createUserList); + flag = this.filterIsMatchRepositoryByCreateUser(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("versionId"),createUserList); }else { flag = createUserList.contains(((JSONObject)item).getString("createUser")) || createUserList.contains(((JSONObject)item).getString("modifyUser")); } @@ -7911,7 +7911,7 @@ public class CoeProcessLevelWeb extends ActionWeb { return true; } if ("process.framework".equals(itemObj.getString("plMethodId")) || "default".equals(itemObj.getString("plMethodId"))){ - flag = this.filterIsMatchPropertyModel(itemObj.getString("wsId"),itemObj.getString("currId"),tempOrgList); + flag = this.filterIsMatchPropertyModel(itemObj.getString("wsId"),itemObj.getString("versionId"),tempOrgList); }else { List relationModels = DesignerShapeRelationCache.getByFileId(itemObj.getString("currId"), "Issuing_department"); // 是否有发布部门的文件属性【可能会有多个值】 @@ -9411,7 +9411,8 @@ public String deleteReply(String replyid, String messageid) { ResponseObject ro = ResponseObject.newOkResponse(); CoeCooperationAPIManager.getInstance().queryCooperationMemberActionPerm(teamId, _uc.getUID(), ro); // 找出上一次的查询条件 如果有则覆盖 没有就直接保存 - String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition"); + // String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition"); + String queryCondition = (String) _uc.getExtParam("query_condition_"+_uc.getSessionId()); JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray(); JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray(); JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray(); @@ -9438,7 +9439,8 @@ public String deleteReply(String replyid, String messageid) { condtion.put("methodIds",methodIdList); condtions.put(_uc.getUID(),condtion); } - SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString()); + // SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString()); + _uc.setExtParam("query_condition_"+_uc.getSessionId(),condtions.toJSONString()); // 获取文件模型的图标icon JSONObject methodIcons = new JSONObject(); // 获取最近编辑的文件 @@ -9453,7 +9455,7 @@ public String deleteReply(String replyid, String messageid) { // 组织下的内容与IT系统图不在【架构筛选】影响范围之内 if (!("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId()))) { if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ - flag = this.filterEmptyMoldel(model.getWsId(),model.getId()); + flag = this.filterEmptyMoldel(model.getWsId(),model.getVersionId()); } } return flag; @@ -9469,7 +9471,7 @@ public String deleteReply(String replyid, String messageid) { // 代表【架构】伊利专属需求 if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterChildLevelModelByPid(model.getWsId(), model.getId(),methodIdList); + flag = this.filterChildLevelModelByPid(model.getWsId(), model.getVersionId(),methodIdList); }else { flag = methodIdList.contains(model.getMethodId()); } @@ -9485,7 +9487,7 @@ public String deleteReply(String replyid, String messageid) { } if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterIsMatchRepositoryByCreateUser(model.getWsId(), model.getId(),createUserList); + flag = this.filterIsMatchRepositoryByCreateUser(model.getWsId(), model.getVersionId(),createUserList); }else { flag = createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser()); } @@ -9509,7 +9511,7 @@ public String deleteReply(String replyid, String messageid) { return true; } if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ - flag = this.filterIsMatchPropertyModel(model.getWsId(),model.getId(),tempOrgList); + flag = this.filterIsMatchPropertyModel(model.getWsId(),model.getVersionId(),tempOrgList); }else { List relationModels = DesignerShapeRelationCache.getByFileId(model.getId(), "Issuing_department"); // 是否有发布部门的文件属性【可能会有多个值】 @@ -9745,7 +9747,7 @@ public String deleteReply(String replyid, String messageid) { while (iterator.hasNext()) { PALRepositoryModel currentModel = iterator.next(); if ("process.framework".equals(currentModel.getMethodId()) || "default".equals(currentModel.getMethodId())) { - flag = this.filterChildLevelModelByPid(wsId,currentModel.getId(),methodIdList); + flag = this.filterChildLevelModelByPid(wsId,currentModel.getVersionId(),methodIdList); }else { flag = methodIdList.contains(currentModel.getMethodId()); } @@ -9768,7 +9770,7 @@ public String deleteReply(String replyid, String messageid) { while (iterator.hasNext()) { PALRepositoryModel currentModel = iterator.next(); if ("process.framework".equals(currentModel.getMethodId()) || "default".equals(currentModel.getMethodId())) { - flag = this.filterIsMatchRepositoryByCreateUser(wsId,currentModel.getId(),createUserList); + flag = this.filterIsMatchRepositoryByCreateUser(wsId,currentModel.getVersionId(),createUserList); }else { flag = createUserList.contains(currentModel.getCreateUser()) || createUserList.contains(currentModel.getModifyUser()); } @@ -9807,7 +9809,7 @@ public String deleteReply(String replyid, String messageid) { while (iterator.hasNext()) { PALRepositoryModel currentModel = iterator.next(); if ("process.framework".equals(currentModel.getMethodId()) || "default".equals(currentModel.getMethodId())) { - flag = this.filterIsMatchPropertyModel(wsId,currentModel.getId(),orgIdList); + flag = this.filterIsMatchPropertyModel(wsId,currentModel.getVersionId(),orgIdList); }else { List relationModels = DesignerShapeRelationCache.getByFileId(currentModel.getId(), "Issuing_department"); // 是否有发布部门的文件属性【可能会有多个值】 @@ -9837,7 +9839,7 @@ public String deleteReply(String replyid, String messageid) { while (iterator.hasNext()) { PALRepositoryModel currentModel = iterator.next(); if ("process.framework".equals(currentModel.getMethodId()) || "default".equals(currentModel.getMethodId())) { - flag = this.filterEmptyMoldel(wsId,currentModel.getId()); + flag = this.filterEmptyMoldel(wsId,currentModel.getVersionId()); }else { flag = true; } @@ -10113,7 +10115,7 @@ public String deleteReply(String replyid, String messageid) { boolean flag = true; if (!("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId")))) { if ("process.framework".equals(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId"))){ - flag = this.filterEmptyMoldel(((JSONObject)item).getString("wsId"),((JSONObject)item).getString("id")); + flag = this.filterEmptyMoldel(((JSONObject)item).getString("wsId"),((JSONObject)item).getString("versionId")); } } return flag; @@ -10129,7 +10131,7 @@ public String deleteReply(String replyid, String messageid) { boolean flag = false; if ("process.framework".equals(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId"))){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterChildLevelModelByPid(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("id"),methodIdList); + flag = this.filterChildLevelModelByPid(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("versionId"),methodIdList); }else { flag = methodIdList.contains(((JSONObject)item).getString("methodId")); } @@ -10147,7 +10149,7 @@ public String deleteReply(String replyid, String messageid) { boolean flag = false; if ("process.framework".equals(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId"))){ // 递归判断当前架构下是否有符合的文件类型 - flag = this.filterIsMatchRepositoryByCreateUser(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("id"),createUserList); + flag = this.filterIsMatchRepositoryByCreateUser(((JSONObject)item).getString("wsId"), ((JSONObject)item).getString("versionId"),createUserList); }else { flag = createUserList.contains(((JSONObject)item).getString("createUser")) || createUserList.contains(((JSONObject)item).getString("modifyUser")); } @@ -10173,7 +10175,7 @@ public String deleteReply(String replyid, String messageid) { return true; } if ("process.framework".equals(itemObj.getString("methodId")) || "default".equals(itemObj.getString("methodId"))){ - flag = this.filterIsMatchPropertyModel(itemObj.getString("wsId"),itemObj.getString("id"),tempOrgList); + flag = this.filterIsMatchPropertyModel(itemObj.getString("wsId"),itemObj.getString("versionId"),tempOrgList); }else { List relationModels = DesignerShapeRelationCache.getByFileId(itemObj.getString("id"), "Issuing_department"); // 是否有发布部门的文件属性【可能会有多个值】 @@ -12224,7 +12226,8 @@ public String deleteReply(String replyid, String messageid) { // 上一次的筛选条件 JSONObject historyCondition = null; - String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition"); + // String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition"); + String queryCondition = (String) _uc.getExtParam("query_condition_"+_uc.getSessionId()); if (UtilString.isNotEmpty(queryCondition)){ JSONObject condition = JSONObject.parseObject(queryCondition); if (condition.containsKey(_uc.getUID())) { @@ -12246,7 +12249,8 @@ public String deleteReply(String replyid, String messageid) { condtion.put("orgIds",historyCondition.getJSONArray("orgIds")); condtion.put("methodIds",historyCondition.getJSONArray("methodIds")); condtions.put(_uc.getUID(),condtion); - SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString()); + // SDK.getPortalAPI().setUserProfileItem(CoEConstant.APP_ID,_uc.getUID(),"process_query_condition","process_query_condition",condtions.toJSONString()); + _uc.setExtParam("query_condition_"+_uc.getSessionId(),condtions.toJSONString()); } ro.put("historyCondition",historyCondition); return ro.toString();