diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java index c9b7ab7..5f86217 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -306,4 +306,17 @@ public class UserController { public Result getUserByMobile( String mobile) { return userService.getUserByMobile(mobile); } + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:33 + * @params [mobile] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getUserListForVolunteerOrg") + public Result> getUserListForVolunteerOrg(@RequestParam Map params) { + PageData page = userService.getUserListForVolunteerOrg(params); + return new Result>().ok(page); + } } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 8f13aa8..81271f4 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -256,4 +256,13 @@ public interface UserDao extends BaseDao { * @return com.elink.esua.epdc.commons.tools.utils.Result */ UserDTO getUserByMobile(@Param("mobile") String mobile); + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:35 + * @params [dto] + * @return java.util.List + */ + List getUserListForVolunteerOrg(Map params); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java index 3ae0cea..948a2bc 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -421,4 +421,13 @@ public interface UserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getUserByMobile(String mobile); + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:33 + * @params [mobile] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + PageData getUserListForVolunteerOrg(Map params); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 3dc1e53..b971e1e 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1566,6 +1566,20 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(user); } + @Override + public PageData getUserListForVolunteerOrg(Map params) { + //分页 + IPage page = getPage(params); + //查询 + List list = baseDao.getUserListForVolunteerOrg(params); + return getPageData(list, page.getTotal(), UserDTO.class); +// +// int pageIndex = (dto.getPage() - NumConstant.ONE) * dto.getLimit(); +// dto.setPage(pageIndex); +// List user = baseDao.getUserListForVolunteerOrg(dto); +// return new Result().ok(user); + } + /** * 用户信息校验 * diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml index 96268bf..323c832 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml @@ -677,5 +677,18 @@ WHERE 1 = 1 where DEL_FLAG='0' and MOBILE=#{mobile} +