diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PatientScoreController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PatientScoreController.java index da52221..d7fa7b8 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PatientScoreController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PatientScoreController.java @@ -33,7 +33,7 @@ public class PatientScoreController { if (!jsonObject.get("code").toString().equals("1")) { return AjaxResult.error(jsonObject.get("msg").toString()); } - return AjaxResult.success(jsonObject.getString("data")); + return AjaxResult.success("请求成功", jsonObject.getString("data")); } @ApiOperation("获取居民积分列表") diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PrizeExchangeController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PrizeExchangeController.java index 780aa7e..52ed330 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PrizeExchangeController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/PrizeExchangeController.java @@ -51,7 +51,9 @@ public class PrizeExchangeController { public AjaxResult getList(PrizeQuery query, @RequestHeader("region") String region) { StringBuffer params = new StringBuffer(); params.append("?identity=").append(query.getIdentity()); - params.append("&status=").append(query.getStatus()); + if(!StringUtils.isBlank(query.getStatus())) { + params.append("&status=").append(query.getStatus()); + } params.append("&pageSize=").append(query.getPageSize() != null && query.getPageSize() > 0 ? query.getPageSize() : 15); params.append("&pageNum=").append(query.getPageNum() != null && query.getPageNum() > 0 ? query.getPageNum() : 1); String result = HttpUtils.sendGet(SpringUtils.getFdUrl(region) + "/prizeExchange/list" + params);