fix 新增根据角色/组织id查询对应用户

boman-modules/boman-system/src/main/java/com/boman/system/controller/BomanGroupController.java

@@ -5,6 +5,8 @@ import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
+import com.boman.domain.BomanGroupUser;
+import com.boman.domain.SysUser;
 import com.boman.domain.constant.UserConstants;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.BomanGroup;
@@ -65,7 +67,7 @@ public class BomanGroupController extends BaseController
     }
 
     /**
-     * 修改部门
+     * 修改组织
      */
     @PreAuthorize(hasPermi = "system:group:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
@@ -117,4 +119,14 @@ public class BomanGroupController extends BaseController
         return bomanGroupService.deleteGroupUser(groupId,userIds);
     }
 
+    /**
+     * 根据组织编号获取对应组织所有用户
+     */
+    @PreAuthorize(hasPermi = "system:role:user")
+    @GetMapping(value = "/user/{groupId}")
+    public AjaxResult getUserInfo(@PathVariable Long groupId)
+    {
+        List<BomanGroupUser> bomanGroupUser = bomanGroupService.selectUserByGroupId(groupId);
+        return AjaxResult.success(bomanGroupUser);
+    }
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -3,6 +3,8 @@ package com.boman.system.controller;
 import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.boman.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -66,6 +68,18 @@ public class SysRoleController extends BaseController
         return AjaxResult.success(roleService.selectRoleById(id));
     }
 
+
+    /**
+     * 根据角色编号获取对应角色所有用户
+     */
+    @PreAuthorize(hasPermi = "system:role:user")
+    @GetMapping(value = "/user/{id}")
+    public AjaxResult getUserInfo(@PathVariable Long id)
+    {
+        List<SysUser> sysUsers = roleService.selectUserByRoleId(id);
+        return AjaxResult.success(sysUsers);
+    }
+
     /**
      * 新增角色
      */
@@ -153,4 +167,6 @@ public class SysRoleController extends BaseController
     {
         return AjaxResult.success(roleService.selectRoleAll());
     }
+
+
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/BomanGroupUserMapper.java

@@ -3,6 +3,7 @@ package com.boman.system.mapper;
 import com.boman.domain.BomanGroup;
 import com.boman.domain.BomanGroupUser;
 import com.boman.domain.SysDept;
+import com.boman.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +22,11 @@ public interface BomanGroupUserMapper
      * @return 自定义组和用户中间表集合
      */
     public List<Long> selectGroupUserList(Long groupId);
+
+    /**
+     * 根据组织编号获取对应组织所有用户
+     * @param groupId
+     * @return
+     */
+    public List<BomanGroupUser> selectUserByGroupId(Long groupId);
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserRoleMapper.java

@@ -2,6 +2,7 @@ package com.boman.system.mapper;
 
 import java.util.List;
 
+import com.boman.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import com.boman.system.domain.SysUserRole;
@@ -61,4 +62,12 @@ public interface SysUserRoleMapper
      * @return 结果
      */
     public int deleteUserRoleInfos(@Param("id") Long id, @Param("ids") Long[] ids);
+
+
+    /**
+     * 根据角色编号获取对应角色所有用户
+     * @param groupId
+     * @return
+     */
+    List<SysUser>selectUserByRoleId(@Param("groupId") Long groupId);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/IBomanGroupService.java

@@ -1,7 +1,9 @@
 package com.boman.system.service;
 
+import com.boman.domain.BomanGroupUser;
 import com.boman.domain.SysDept;
 import com.boman.domain.BomanGroup;
+import com.boman.domain.SysUser;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.system.domain.vo.TreeSelect;
 
@@ -85,4 +87,11 @@ public interface IBomanGroupService
      * @return
      */
     public AjaxResult deleteGroupUser(Long groupId, Long[] userIds);
+
+    /**
+     * 根据组织编号获取对应组织所有用户
+     * @param groupId
+     * @return
+     */
+    public List<BomanGroupUser> selectUserByGroupId(Long groupId);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysRoleService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 
 /**
  * 角色业务层
@@ -51,6 +52,13 @@ public interface ISysRoleService
      */
     public SysRole selectRoleById(Long id);
 
+    /**
+     * 根据角色编号获取对应角色所有用户
+     * @param id
+     * @return
+     */
+    public List<SysUser> selectUserByRoleId(Long id);
+
     /**
      * 校验角色名称是否唯一
      * 

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/BomanGroupServiceImpl.java

@@ -162,4 +162,15 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
         return null;
     }
 
+    /**
+     * 根据组织编号获取对应组织所有用户
+     * @param groupId
+     * @return
+     */
+    @Override
+    public List<BomanGroupUser> selectUserByGroupId(Long groupId) {
+        List<BomanGroupUser> bomanGroupUser = groupUserMapper.selectUserByGroupId(groupId);
+        return bomanGroupUser;
+    }
+
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import com.boman.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -111,6 +113,17 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roleMapper.selectRoleById(id);
     }
 
+    /**
+     * 根据角色编号获取对应角色所有用户
+     * @param id
+     * @return
+     */
+    @Override
+    public List<SysUser> selectUserByRoleId(Long id) {
+        List<SysUser> sysUsers = userRoleMapper.selectUserByRoleId(id);
+        return sysUsers;
+    }
+
     /**
      * 校验角色名称是否唯一
      * 

boman-modules/boman-system/src/main/resources/mapper/system/BomanGroupUserMapper.xml

@@ -23,8 +23,13 @@
         from boman_group_user g
     </sql>
 
-    <select id="selectGroupUserList" parameterType="Long" resultType="Long">
+    <select id="selectGroupUserList" parameterType="Long" resultType="java.lang.Long">
         select user_id from boman_group_user
         where group_id = {groupId}
     </select>
+
+
+    <select id="selectUserByGroupId" parameterType="Long" resultMap="BomanGroupUserResult">
+	    select user_id, user_name from boman_group_user   where group_id=#{groupId}
+	</select>
 </mapper> 

boman-modules/boman-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,6 +9,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 
+	<resultMap type="com.boman.domain.SysUser" id="SysUserResult">
+		<id     property="id"       column="id"      />
+		<result property="deptId"       column="dept_id"      />
+		<result property="userName"     column="user_name"    />
+		<result property="nickName"     column="nick_name"    />
+		<result property="email"        column="email"        />
+		<result property="phonenumber"  column="phonenumber"  />
+		<result property="sex"          column="sex"          />
+		<result property="avatar"       column="avatar"       />
+		<result property="password"     column="password"     />
+		<result property="status"       column="status"       />
+		<result property="delFlag"      column="del_flag"     />
+		<result property="loginIp"      column="login_ip"     />
+		<result property="loginDate"    column="login_date"   />
+		<result property="createBy"     column="create_by"    />
+		<result property="createTime"   column="create_time"  />
+		<result property="updateBy"     column="update_by"    />
+		<result property="updateTime"   column="update_time"  />
+		<result property="remark"       column="remark"       />
+	</resultMap>
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
@@ -41,4 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	        #{userId}
         </foreach>
 	</delete>
+
+	<select id="selectUserByRoleId" resultMap="SysUserResult">
+	    select u.id, u.user_name from sys_user_role r left join sys_user u on r.user_id = u.id  where r.role_id=#{roleId}
+	</select>
 </mapper>