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 298e26ed..bf2cb575 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 2d8e0318..cc947c43 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 @@ -11720,16 +11720,32 @@ public String deleteReply(String replyid, String messageid) { // 组织机构 // 上一次的筛选条件 - // JSONObject historyCondition = new JSONObject(); + JSONObject historyCondition = null; String queryCondition = SDK.getPortalAPI().getUserProfileItem(CoEConstant.APP_ID, _uc.getUID(), "process_query_condition", "process_query_condition"); if (UtilString.isNotEmpty(queryCondition)){ JSONObject condition = JSONObject.parseObject(queryCondition); if (condition.containsKey(_uc.getUID())) { - JSONObject historyCondition = condition.getJSONObject(_uc.getUID()); - // historyCondition = currentCondition; - ro.put("historyCondition",historyCondition); + JSONObject currentCondition = condition.getJSONObject(_uc.getUID()); + historyCondition = currentCondition; } + }else { // 初始默认 文件类型全选 创建人与组织机构为空 + historyCondition = new JSONObject(); + historyCondition.put("createUsers",new JSONArray()); + historyCondition.put("orgIds",new JSONArray()); + historyCondition.put("methodIds",new JSONArray()); + for (Object o : methodIds) { + JSONObject methodObj = (JSONObject) o; + historyCondition.getJSONArray("methodIds").add(methodObj.getString("methodId")); + } + JSONObject condtions = new JSONObject(); + JSONObject condtion = new JSONObject(); + condtion.put("createUsers",historyCondition.getJSONArray("createUsers")); + 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()); } + ro.put("historyCondition",historyCondition); return ro.toString(); } }