Browse Source

提交分类: 测试版本;
提交内容: 数据查询bug
当前版本: 正式版本6.3.4
是否冲突: 否

RaoMeng 7 years ago
parent
commit
954c0e8a3d

+ 1 - 7
app_core/common/src/main/java/com/core/net/http/HttpUtil.java

@@ -1,6 +1,5 @@
 package com.core.net.http;
 
-import android.os.Looper;
 import android.util.Log;
 
 import com.common.LogUtil;
@@ -34,8 +33,6 @@ import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -45,9 +42,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-
 import static com.loopj.android.http.RequestParams.APPLICATION_JSON;
 
 
@@ -127,7 +121,7 @@ public class HttpUtil {
                 for (Entry<String, Object> entry : entrys) {
                     if (entry.getValue() != null)
                         nvps.add(new BasicNameValuePair(entry.getKey(),
-                                URLDecoder.decode(URLEncoder.encode(entry.getValue().toString().replaceAll("%", ""), "utf-8"), "utf-8")));
+                                URLDecoder.decode(URLEncoder.encode(entry.getValue().toString(), "utf-8"), "utf-8")));
                     else
                         nvps.add(new BasicNameValuePair(entry.getKey(), URLDecoder.decode("", "utf-8")));
                 }

+ 3 - 0
app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -1049,6 +1049,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         params.put("pageIndex", mPageIndex);
         params.put("pageSize", mPageSize);
         params.put("condition", mCondition);
+        params.put("master", CommonUtil.getMaster());
+        params.put("sessionUser", CommonUtil.getEmcode());
+        params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_DATA_RESULT, null, null, "post");