Merge branch 'master' of https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

tiku_App/src/com/offcn/api/tk/app3/department.java

@@ -149,12 +149,8 @@ public class department extends TK implements API {
 			}
 			
 			if("0".equals(code)){
-//				List<String> list=jp.getList("data.departments.list");
-//				if (list!=null && list.size()>0 && list.get(0)!=null) {
-//						L_office_id=jp.getString("data.offices.list[0].id[0]");
-//						System.out.println(L_office_id);										
-//				}
 				L_department_id=jp.getString("data.departments.list.id");
+				L_department_id = L_department_id.replace("[", "").replace("]", "").trim();
 				System.out.println(L_department_id);
 				conn=ConnectionsMap.get("tk");
 			}

tiku_App/src/com/offcn/api/tk/app3/position.java

@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
 
 
 /**
- * 79.获取用人司局
+ * 80.获取职位信息
  * 
  * @author mr
  * 
@@ -39,7 +39,7 @@ import net.sf.json.JSONObject;
 public class position extends TK implements API {
 	public String parameter;//参数集合
 	
-	public String office_id;//招录机关id
+	public String department_id;//用人司局id
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -52,11 +52,11 @@ public class position extends TK implements API {
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
-		office_id = MapUtil.getParameter(parameter, "office_id").trim();
+		department_id = MapUtil.getParameter(parameter, "department_id").trim();
 		
-		if ((!office_id.equals("")) && office_id.equals("code")) {
-			office_id = L_office_id;
-			parameter = parameter.replace("\"office_id\":code","\"office_id\":\""+office_id+"\"");
+		if ((!department_id.equals("")) && department_id.equals("code")) {
+			department_id = L_department_id;
+			parameter = parameter.replace("\"department_id\":code","\"department_id\":\""+department_id+"\"");
 		}
 		
 		data.put("parameter", parameter);
@@ -77,7 +77,7 @@ public class position extends TK implements API {
 		jsonAsMap.put("appid", tikuString);
 		
 //		office_id = MapUtil.killQuotes(office_id, "\"");
-		jsonAsMap.put("office_id", office_id);
+		jsonAsMap.put("department_id", department_id);
 			
 		MyRequest myRequest=new MyRequest();
 		myRequest.setUrl(Url);
@@ -149,13 +149,6 @@ public class position extends TK implements API {
 			}
 			
 			if("0".equals(code)){
-//				List<String> list=jp.getList("data.departments.list");
-//				if (list!=null && list.size()>0 && list.get(0)!=null) {
-//						L_office_id=jp.getString("data.offices.list[0].id[0]");
-//						System.out.println(L_office_id);										
-//				}
-				L_department_id=jp.getString("data.departments.list.id");
-				System.out.println(L_department_id);
 				conn=ConnectionsMap.get("tk");
 			}
 		}