Commit 04e3fd0baf5c8bde44cf2e930dd0f402d10f4c88
1 parent
a8710cb1b8
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
04e3fd0
| ... | ... | @@ -2051,13 +2051,13 @@ |
| 2051 | 2051 | } |
| 2052 | 2052 | } |
| 2053 | 2053 | Integer count = userIds.size(); |
| 2054 | - List<String> ids = CollectionUtils.getPageIds(userIds, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")); | |
| 2055 | 2054 | Map<String, Object> param2 = new HashMap<>(); |
| 2056 | 2055 | param2.putAll(param); |
| 2057 | 2056 | param2.put("hid", param.get("hospitalId")); |
| 2058 | - param2.put("uids", ids); | |
| 2057 | +// param2.put("uids", ids); | |
| 2058 | + param2.put("uids", userIds); | |
| 2059 | 2059 | List<Map<String,Object>> userSendInfo = couponMapper.findUserSendInfoByUids(param2); |
| 2060 | - System.out.println(ids); | |
| 2060 | + System.out.println(userIds); | |
| 2061 | 2061 | // Integer count = couponMapper.findUserSendInfoCount(param); |
| 2062 | 2062 | for (Map<String, Object> map : userSendInfo) { |
| 2063 | 2063 | String userId = (String) map.get("user_id"); |
| ... | ... | @@ -2073,7 +2073,7 @@ |
| 2073 | 2073 | |
| 2074 | 2074 | } |
| 2075 | 2075 | } |
| 2076 | - PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo)); | |
| 2076 | + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2")))); | |
| 2077 | 2077 | return RespBuilder.buildSuccess(pageResult); |
| 2078 | 2078 | } else if(type == 999) { /** 先占位置 */ |
| 2079 | 2079 |