Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

xuzuoyun 4 lat temu
rodzic
commit
4138124b06

+ 9 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -3218,13 +3218,16 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                                                 JSONObject props = compJson.getJSONObject("props");
                                                 if (!Check.isNull(props)) {
                                                     Long returnAppId = props.getLong("appId");
-                                                    if (returnAppId.equals(appId)) {
-                                                        JSONObject returnJson = new JSONObject();
-                                                        returnJson.put("siteId", jsonObject.getString("id"));
-                                                        returnJson.put("name", jsonObject.getString("name"));
-                                                        returnJson.put("appId", returnAppId);
-                                                        returnArr.add(returnJson);
+                                                    if (!Check.isNull(returnAppId)) {
+                                                        if (returnAppId.equals(appId)) {
+                                                            JSONObject returnJson = new JSONObject();
+                                                            returnJson.put("siteId", jsonObject.getString("id"));
+                                                            returnJson.put("name", jsonObject.getString("name"));
+                                                            returnJson.put("appId", returnAppId);
+                                                            returnArr.add(returnJson);
+                                                        }
                                                     }
+
                                                 }
                                             }
                                         }