|
@@ -264,6 +264,7 @@ public class CompanyController {
|
|
|
|
|
|
List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(list);
|
|
|
|
|
|
+
|
|
|
msgResult.setResult(true);
|
|
|
msgResult.setData(jpCloudUserList);
|
|
|
}
|
|
@@ -281,8 +282,12 @@ public class CompanyController {
|
|
|
|
|
|
@ApiOperation(value="获取推广人员信息列表")
|
|
|
@RequestMapping(value = "promoterList",method = RequestMethod.POST)
|
|
|
- public MessageResult<List<JpCloudUser>> promoterList(){
|
|
|
- MessageResult<List<JpCloudUser>> msgResult = new MessageResult<>();
|
|
|
+ public MessageResult<Map> promoterList(
|
|
|
+ @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
+ @RequestParam(value="pageSize",defaultValue="20") int pageSize
|
|
|
+ ){
|
|
|
+
|
|
|
+ MessageResult<Map> msgResult = new MessageResult<>();
|
|
|
|
|
|
try {
|
|
|
List<Company> companyList = companyService.list();
|
|
@@ -299,8 +304,19 @@ public class CompanyController {
|
|
|
|
|
|
List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(disList);
|
|
|
|
|
|
+ Page<JpCloudUser> page = new Page<JpCloudUser>();
|
|
|
+
|
|
|
+ for (JpCloudUser jpCloudUser:jpCloudUserList) {
|
|
|
+ page.add(jpCloudUser);
|
|
|
+ }
|
|
|
+
|
|
|
+ page.setPageSize(pageSize);
|
|
|
+ page.setPageNum(pageIndex);
|
|
|
+ page.setTotal(jpCloudUserList.size());
|
|
|
+
|
|
|
+
|
|
|
msgResult.setResult(true);
|
|
|
- msgResult.setData(jpCloudUserList);
|
|
|
+ msgResult.setData(PojoUtils.pageWrapper(page));
|
|
|
}
|
|
|
catch(Exception ex){
|
|
|
logger.error(ex.getMessage(),ex);
|