diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index e68dd09..f508e28 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -512,4 +512,16 @@ public class SysUserController { return sysUserService.updateAvatar(avatar); } + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 获取角色成员 + * @author zhangyuan + * @date 2020/5/30 16:11 + */ + @GetMapping("getRoleMembers") + public Result> getRoleMembers(SysRoleMembersFormDTO formDTO) { + return sysUserService.getRoleMembers(formDTO); + } + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index d7902e7..b51eae4 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -8,6 +8,8 @@ package com.elink.esua.epdc.dao; +import com.elink.esua.epdc.dto.SysRoleMembersDTO; +import com.elink.esua.epdc.dto.SysRoleMembersFormDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.entity.SysUserEntity; @@ -105,4 +107,13 @@ public interface SysUserDao extends BaseDao { * @Date: 2020-01-09 */ List getSysGridLeaderPhone(Long deptId); + + /** + * @Description: 获取角色成员 + * @Param: [dto] + * @return: java.util.List + * @Author: zhy + * @Date: 2020-06-09 + */ + List getRoleMembers(SysRoleMembersFormDTO dto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 9a5363b..2355367 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -11,6 +11,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysRoleMembersFormDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; @@ -136,4 +137,13 @@ public interface SysUserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result updateAvatar(String avatar); + + /** + * @describe: 获取成员角色 + * @author zhangyuan + * @date 2020/3/30 16:12 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getRoleMembers(SysRoleMembersFormDTO dto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 94fd363..18280fb 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SysUserDao; +import com.elink.esua.epdc.dto.SysRoleMembersDTO; +import com.elink.esua.epdc.dto.SysRoleMembersFormDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; @@ -289,5 +291,9 @@ public class SysUserServiceImpl extends BaseServiceImpl> getRoleMembers(SysRoleMembersFormDTO dto){ + List list = baseDao.getRoleMembers(dto); + return new Result>().ok(list); + } } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index 873cb62..8fc7ebe 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -152,4 +152,29 @@ AND d.dept_id = #{deptId} ) c + +