Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/juxin/client/websocket/FindTask.java

src/main/java/com/juxin/client/websocket/FindTask.java

@@ -674,22 +674,31 @@ public class FindTask {
                 "        }\n" +
                 "      ]\n" +
                 "    }";
-        JSONObject jsonObject = JSONUtil.parseObj(reqJson);
-        JSONObject param = jsonObject.get("params", JSONObject.class);
-        Map<String, Object> result = new HashMap<>();
-        result.put("infoType", "result");
-        result.put("postType", "python");
-        result.put("methodType", "thirdOwnerResult");
-        Map<String, Object> req = new HashMap<>();
-        req.put("applicationId", param.get("applicationid"));
-        req.put("accountSearchType", param.get("accountSearchType"));
-        req.put("status", SPLIT_RESULT[RandomUtil.randomInt(0, 10)]);
-        req.put("valueCount", RandomUtil.randomInt(0, 10000));
-        JSONObject thirdSubject = JSONUtil.parseObj(thirdSubjectResult);
-        thirdSubject.put("applicationid", param.get("applicationid"));
-        thirdSubject.put("data", param.get("data"));
-        req.put("thirdSubjectResult", thirdSubject);
-        result.put("reqJson", req);
+       JSONObject jsonObject = JSONUtil.parseObj(reqJson);
+       JSONObject param = jsonObject.get("params", JSONObject.class);
+       Map<String, Object> result = new HashMap<>();
+       result.put("infoType", "result");
+       result.put("postType", "python");
+       result.put("methodType", "thirdOwnerResult");
+       Map<String, Object> req = new HashMap<>();
+       req.put("applicationId", param.get("applicationid"));
+       req.put("accountSearchType",param.get("accountSearchType"));
+       String status = SPLIT_RESULT[RandomUtil.randomInt(0, 10)];
+       if (Objects.equals(status, "机构已反馈")) {
+           req.put("status", status);
+           req.put("valueCount", RandomUtil.randomInt(0, 10000));
+           JSONObject thirdSubject=JSONUtil.parseObj(thirdSubjectResult);
+           thirdSubject.put("applicationid", param.get("applicationid"));
+           thirdSubject.put("data",param.get("data"));
+           req.put("thirdSubjectResult",thirdSubject);
+           result.put("reqJson", req);
+       } else {
+           req.put("status", status);
+           req.put("valueCount", 0);
+           req.put("thirdSubjectResult","");
+           result.put("reqJson", req);
+       }
+
 
         System.out.println(result);
         return JSONUtil.toJsonStr(result);