diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java index 8819b8a..6830919 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java @@ -114,16 +114,18 @@ public class IndexServiceImpl implements IndexService { param.put("page", 1); param.put("limit", Integer.MAX_VALUE); String result = ykUtil.call(YkInfo.getAllAppList, param, JSONArray.class); - List list = JSONObject.parseObject(result, List.class); + JSONObject allAppJson = JSONObject.parseObject(result, JSONObject.class); + List allAppList = JSONObject.parseObject(allAppJson.getString("list"), List.class); + List userAppList = getUserAppList(requestContext); List appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); - for (JSONObject data : list) { + for (JSONObject data : allAppList) { if(appIdList.contains(data.getString("appId"))){ data.put("enable", "1"); } } - return new GeneralResult(true, userAppList, "查询成功"); + return new GeneralResult(true, allAppList, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败");