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 256cf6ed..298e26ed 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 698f8084..2d8e0318 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,35 +11720,16 @@ public String deleteReply(String replyid, String messageid) {
// 组织机构
// 上一次的筛选条件
- JSONObject historyCondition = null;
+ // JSONObject historyCondition = new JSONObject();
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 currentCondition = condition.getJSONObject(_uc.getUID());
- historyCondition = currentCondition;
+ JSONObject historyCondition = condition.getJSONObject(_uc.getUID());
+ // historyCondition = currentCondition;
+ ro.put("historyCondition",historyCondition);
}
- }else { // 初始默认选中当前人 当前人所在部门
- historyCondition = new JSONObject();
- historyCondition.put("createUsers",new JSONArray());
- historyCondition.getJSONArray("createUsers").add(_uc.getUID());
- historyCondition.put("orgIds",new JSONArray());
- historyCondition.getJSONArray("orgIds").add(_uc.getDepartmentModel().getId());
- 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();
}
}
diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm
index b9a88a21..9b43828b 100644
--- a/com.actionsoft.apps.coe.pal/template/page/main.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/main.htm
@@ -4,7 +4,7 @@
var notificationSoundTips = false; // 是否开启消息到达声音提醒
var notificationMsgLoadFrequency = 60; // 通知消息检查频率
var isSecurityPwdChange = <#isSecurityPwdChange>; // 是否允许用户修改口令
- var forceChangePwd = false; // 默认口令验证，是否强制修改默认密码
+ var forceChangePwd = <#forceChangePwd>; // 默认口令验证，是否强制修改默认密码
var isSecurityPwdComplexity = <#isSecurityPwdComplexity>; // 密码强度
var securityMinPwdLength = <#securityMinPwdLength>; // 允许账户口令最小长度，0表示无限制
var securityMaxPwdLength = <#securityMaxPwdLength>; // 允许账户口令最大长度，最多32位长度
@@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
- var jdHref = "./jd";