Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com.boman.domain/BomanGroup.java

@@ -35,16 +35,16 @@ public class BomanGroup extends BaseEntity {
 
 
     /**
-     * 用户集合
+     * 组和用户中间表对象(存着用户名字和id)
      */
-    private List<SysUser> sysUserList;
+    private List<BomanGroupUser> bomanGroupUserList;
 
-    public List<SysUser> getSysUserList() {
-        return sysUserList;
+    public List<BomanGroupUser> getBomanGroupUserList() {
+        return bomanGroupUserList;
     }
 
-    public void setSysUserList(List<SysUser> sysUserList) {
-        this.sysUserList = sysUserList;
+    public void setBomanGroupUserList(List<BomanGroupUser> bomanGroupUserList) {
+        this.bomanGroupUserList = bomanGroupUserList;
     }
 
     public Long getId() {
@@ -95,7 +95,7 @@ public class BomanGroup extends BaseEntity {
                 ", status='" + status + '\'' +
                 ", number=" + number +
                 ", isDel='" + isDel + '\'' +
-                ", sysUserList=" + sysUserList +
+                ", bomanGroupUserList=" + bomanGroupUserList +
                 '}';
     }
 }

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

@@ -103,7 +103,7 @@ public class BomanGroupController extends BaseController
      * @param userIds
      * @return
      */
-    @GetMapping("/addGroupUser/{groupIds}/{userIds}")
+    @GetMapping("/addGroupUser/{groupId}/{userIds}")
     public AjaxResult addGroupUser(@PathVariable Long groupId,@PathVariable Long[] userIds){
         return bomanGroupService.insertUserGroup(groupId,userIds);
     }
@@ -114,19 +114,21 @@ public class BomanGroupController extends BaseController
      * @param userIds
      * @return
      */
-    @GetMapping("/deleteGroupUser/{groupIds}/{userIds}")
+    @GetMapping("/deleteGroupUser/{groupId}/{userIds}")
     public AjaxResult deleteGroupUser(@PathVariable Long groupId,@PathVariable Long[] userIds){
         return bomanGroupService.deleteGroupUser(groupId,userIds);
     }
 
     /**
-     * 根据组织编号获取对应组织所有用户
+     * 根据组织编号获取对应组织所有用户的用户id,用户名,部门名称,角色名
      */
     @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);
+        List<SysUser> sysUsers = bomanGroupService.selectUserByGroupId(groupId);
+        return AjaxResult.success(sysUsers);
     }
+
+
 }

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

@@ -89,6 +89,18 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(deptService.selectDeptById(id));
     }
 
+
+    /**
+     * 根据部门编号获取用户
+     */
+    @PreAuthorize(hasPermi = "system:dept:user")
+    @GetMapping(value = "/user/{id}")
+    public AjaxResult getUserInfo(@PathVariable Long id)
+    {
+        return AjaxResult.success(deptService.getUserInfo(id));
+    }
+
+
     /**
      * 根据部门编号获取详细信息
      */

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

@@ -70,7 +70,7 @@ public class SysRoleController extends BaseController
 
 
     /**
-     * 根据角色编号获取对应角色所有用户
+     * 根据角色编号获取对应角色用户的用户id,用户名,部门名称,角色名
      */
     @PreAuthorize(hasPermi = "system:role:user")
     @GetMapping(value = "/user/{id}")

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

@@ -286,6 +286,14 @@ public class SysUserController extends BaseController
        return userService.listByDeptId(deptIdList);
     }
 
+    /**
+     * 接收完整的用户对象提取用户的部门名称和角色名称
+     */
+    @PostMapping("/getDeptNameAndRoleName")
+    public AjaxResult getDeptNameAndRoleName(@RequestBody List<SysUser> sysUserList) {
+        return userService.getDeptNameAndRoleName(sysUserList);
+    }
+
     /**
      * 为用户档案定制新增接口
      * @param result 结果

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

@@ -23,10 +23,19 @@ public interface BomanGroupUserMapper
      */
     public List<Long> selectGroupUserList(Long groupId);
 
+
     /**
-     * 根据组织编号获取对应组织所有用户
+     * 给组删除用户
      * @param groupId
+     * @param userIds
+     * @return
+     */
+    public int deleteGroupUser( @Param("groupId") Long groupId, @Param("userIds") Long[] userIds);
+
+    /**
+     * 给组新增用户
+     * @param bomanGroupUserList
      * @return
      */
-    public List<BomanGroupUser> selectUserByGroupId(Long groupId);
+    public int insertUserGroup(@Param("bomanGroupUserList") List<BomanGroupUser> bomanGroupUserList);
 }

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

@@ -114,4 +114,19 @@ public interface SysUserMapper
      * 部门下所有人
      */
     List<SysUser> listByDeptId(@Param("deptIdList") List<Long> deptIdList);
+
+    /**
+     * 根据用户id查询用户
+     * @return
+     */
+    List<SysUser>selectUserByUserIds(@Param("ids") List<Long> ids);
+
+    /**
+     * 根据部门id查询对应用户
+     * @param deptId
+     * @return
+     */
+    List<SysUser>selectUserByDeptId(@Param("deptId") Long deptId);
 }
+
+

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

@@ -63,11 +63,10 @@ public interface SysUserRoleMapper
      */
     public int deleteUserRoleInfos(@Param("id") Long id, @Param("ids") Long[] ids);
 
-
     /**
-     * 根据角色编号获取对应角色所有用户
-     * @param groupId
+     * 根据角色id查询对应用户
+     * @param roleId
      * @return
      */
-    List<SysUser>selectUserByRoleId(@Param("groupId") Long groupId);
+    List<Long> selectUserIdsByRoleId (@Param("roleId") Long roleId);
 }

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

@@ -93,5 +93,5 @@ public interface IBomanGroupService
      * @param groupId
      * @return
      */
-    public List<BomanGroupUser> selectUserByGroupId(Long groupId);
+    public List<SysUser> selectUserByGroupId(Long groupId);
 }

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

@@ -3,6 +3,7 @@ package com.boman.system.service;
 import java.util.List;
 
 import com.boman.domain.SysDept;
+import com.boman.domain.SysUser;
 import com.boman.system.domain.vo.TreeSelect;
 
 /**
@@ -52,6 +53,13 @@ public interface ISysDeptService
      */
     public SysDept selectDeptById(Long id);
 
+    /**
+     * 根据部门编号获取用户
+     * @param id
+     * @return
+     */
+    public List<SysUser> getUserInfo(Long id);
+
     /**
      * 根据ID查询所有子部门（正常状态）
      * 

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.SysUser;
+import com.boman.domain.dto.AjaxResult;
 
 /**
  * 用户 业务层
@@ -167,6 +168,13 @@ public interface ISysUserService
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
+    /**
+     * 接收完整的用户对象提取用户的部门名称和角色名称
+     * @param sysUserList
+     * @return
+     */
+    AjaxResult getDeptNameAndRoleName(List<SysUser> sysUserList);
+
     /**
      * 部门下所有人
      */

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

@@ -1,6 +1,7 @@
 package com.boman.system.service.impl;
 
 import com.boman.common.core.exception.CustomException;
+import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -135,17 +136,21 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
         list.removeIf(longs::contains
         );
         if (list.size() > 0){
+            List<BomanGroupUser> bomanGroupUserList = new ArrayList<>();
             for (Long userId : list) {
                 BomanGroupUser bomanGroupUser = new BomanGroupUser();
                 bomanGroupUser.setUserId(userId);
                 bomanGroupUser.setGroupId(groupId);
+                bomanGroupUser.setCreateBy(SecurityUtils.getUsername());
                 SysUser user = sysUserMapper.selectUserById(userId);
                 if (user != null){
                     bomanGroupUser.setUserName(user.getUserName());
+                    bomanGroupUserList.add(bomanGroupUser);
                 }else {
                     return AjaxResult.error("该用户不存在");
                 }
             }
+            groupUserMapper.insertUserGroup(bomanGroupUserList);
         }
         return AjaxResult.success();
     }
@@ -159,7 +164,8 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
      */
     @Override
     public AjaxResult deleteGroupUser(Long groupId, Long[] userIds) {
-        return null;
+        groupUserMapper.deleteGroupUser(groupId,userIds);
+        return AjaxResult.success();
     }
 
     /**
@@ -168,9 +174,14 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
      * @return
      */
     @Override
-    public List<BomanGroupUser> selectUserByGroupId(Long groupId) {
-        List<BomanGroupUser> bomanGroupUser = groupUserMapper.selectUserByGroupId(groupId);
-        return bomanGroupUser;
+    public List<SysUser> selectUserByGroupId(Long groupId) {
+        //所有组对应的用户id
+        List<Long> userIds = groupUserMapper.selectGroupUserList(groupId);
+        List<SysUser> sysUsers = new ArrayList<>();
+        if (userIds.size() > 0){
+            sysUsers = sysUserMapper.selectUserByUserIds(userIds);
+        }
+        return sysUsers;
     }
 
 }

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.domain.SysUser;
+import com.boman.system.mapper.SysUserMapper;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +36,9 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Autowired
     private SysRoleMapper roleMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询部门管理数据
      * 
@@ -117,6 +122,17 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectDeptById(id);
     }
 
+    /**
+     * 根据部门id查询所有部门用户
+     * @param id
+     * @return
+     */
+    @Override
+    public List<SysUser> getUserInfo(Long id) {
+        List<SysUser> sysUsers = sysUserMapper.selectUserByDeptId(id);
+        return sysUsers;
+    }
+
     /**
      * 根据ID查询所有子部门（正常状态）
      * 

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.boman.domain.SysUser;
+import com.boman.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,10 +19,6 @@ import com.boman.common.datascope.annotation.DataScope;
 import com.boman.domain.SysRole;
 import com.boman.system.domain.SysRoleDept;
 import com.boman.system.domain.SysRoleMenu;
-import com.boman.system.mapper.SysRoleDeptMapper;
-import com.boman.system.mapper.SysRoleMapper;
-import com.boman.system.mapper.SysRoleMenuMapper;
-import com.boman.system.mapper.SysUserRoleMapper;
 import com.boman.system.service.ISysRoleService;
 
 /**
@@ -44,6 +41,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Autowired
     private SysRoleDeptMapper roleDeptMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 根据条件分页查询角色数据
      * 
@@ -120,7 +120,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     public List<SysUser> selectUserByRoleId(Long id) {
-        List<SysUser> sysUsers = userRoleMapper.selectUserByRoleId(id);
+        List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(id);
+        List<SysUser> sysUsers = sysUserMapper.selectUserByUserIds(userIds);
         return sysUsers;
     }
 

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

@@ -7,6 +7,8 @@ import java.util.List;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.domain.SysDept;
+import com.boman.domain.dto.AjaxResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,9 @@ import com.boman.system.mapper.SysUserRoleMapper;
 import com.boman.system.service.ISysConfigService;
 import com.boman.system.service.ISysUserService;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
 /**
  * 用户 业务层处理
  * 
@@ -466,6 +471,34 @@ public class SysUserServiceImpl implements ISysUserService
         return successMsg.toString();
     }
 
+    /**
+     * 接收完整的用户对象提取用户的部门名称和角色名称
+     * @param sysUserList
+     * @return
+     */
+    @Override
+    public AjaxResult getDeptNameAndRoleName(List<SysUser> sysUserList) {
+        List<String> deptNameList = new ArrayList<>();
+        List<String> roleNameList = new ArrayList<>();
+        if (sysUserList.size() > 0){
+            for (SysUser user : sysUserList) {
+                SysDept dept = user.getDept();
+                List<SysRole> roles = user.getRoles();
+                if (ObjectUtils.isNotEmpty(dept)){
+                    String deptName = dept.getDeptName();
+                    deptNameList.add(deptName);
+                }
+                if (roles.size() > 0){
+                    for (SysRole role : roles) {
+                        String roleName = role.getRoleName();
+                        roleNameList.add(roleName);
+                    }
+                }
+            }
+        }
+        return AjaxResult.success().put("deptNameList",deptNameList).put("roleNameList",roleNameList);
+    }
+
     /**
      * 部门下所有人
      */

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

@@ -14,28 +14,20 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="isDel" column="is_del"/>
-        <collection  property="sysUserList"   javaType="java.util.List"        resultMap="SysUserResult" />
+        <collection  property="bomanGroupUserList"   javaType="java.util.List"        resultMap="BomanGroupUserResult" />
     </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 type="com.boman.domain.BomanGroupUser" id="BomanGroupUserResult">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="groupId" column="group_id"/>
+        <result property="status" column="status"/>
+        <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="isDel" column="is_del"/>
     </resultMap>
 
 
@@ -67,7 +59,7 @@
 
     <select id="checkGroupNameUnique" resultMap="BomanGroupResult">
         <include refid="selectGroupVo"/>
-        where group_name=#{GroupName} limit 1
+        where group_name=#{GroupName} and is_del = 'N' limit 1
     </select>
 
     <insert id="insertGroup" parameterType="com.boman.domain.BomanGroup">
@@ -114,7 +106,7 @@
 
 
 	<update id="deleteGroupById" parameterType="Long">
-		update  boman_group_user set is_del = 'Y' where id in
+		update  boman_group set is_del = 'Y' where id in
 		<foreach collection="array" item="id" open="(" separator="," close=")">
 			#{id}
 		</foreach>

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

@@ -25,11 +25,40 @@
 
     <select id="selectGroupUserList" parameterType="Long" resultType="java.lang.Long">
         select user_id from boman_group_user
-        where group_id = {groupId}
+        where group_id = #{groupId} and is_del = 'N'
     </select>
 
+    <update id="deleteGroupUser" parameterType="Long">
+        update  boman_group_user set is_del = 'Y' where user_id in
+        <foreach collection="userIds"  item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        and group_id = #{groupId}
+    </update>
 
-    <select id="selectUserByGroupId" parameterType="Long" resultMap="BomanGroupUserResult">
-	    select user_id, user_name from boman_group_user   where group_id=#{groupId}
-	</select>
+    <insert id="insertUserGroup" parameterType="com.boman.domain.BomanGroupUser">
+        insert into boman_group_user(
+        <if test="id != null and id != 0">id,</if>
+        <if test="useId != null">user_id,</if>
+        <if test="userName != null and userName != ''">user_name,</if>
+        <if test="groupId != null">group_id,</if>
+        <if test="status != null and status != ''">status,</if>
+        <if test="isDel != null and isDel != ''">is_del,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values
+        <foreach collection ="bomanGroupUserList" item="bomanGroupUser" index= "index" separator =",">
+         (
+            <if test="bomanGroupUser.id != null and bomanGroupUser.id != 0">#{bomanGroupUser.id},</if>
+            <if test="bomanGroupUser.useId != null">#{bomanGroupUser.useId},</if>
+            <if test="bomanGroupUser.userName != null and bomanGroupUser.userName != ''">#{bomanGroupUser.userName},</if>
+            <if test="bomanGroupUser.groupId != null">#{bomanGroupUser.groupId},</if>
+            <if test="bomanGroupUser.status != null and bomanGroupUser.status != ''">#{bomanGroupUser.status},</if>
+            <if test="bomanGroupUser.isDel != null and bomanGroupUser.isDel != ''">#{bomanGroupUser.isDel},</if>
+            <if test="bomanGroupUser.createBy != null and bomanGroupUser.createBy != ''">#{bomanGroupUser.createBy},</if>
+            sysdate()
+                         )
+        </foreach >
+
+    </insert>
 </mapper> 

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

@@ -183,5 +183,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			#{deptId}
         </foreach>
  	</select>
+
+	<select id="selectUserByUserIds" parameterType="Long" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.id in
+		<foreach collection="ids" item="id" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+		and u.status = '0' and u.del_flag = '0'
+	</select>
+
+	<select id="selectUserByDeptId" parameterType="Long" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.dept_id  = #{deptId}
+		and u.status = '0' and u.del_flag = '0'
+	</select>
+
 	
 </mapper> 

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

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.boman.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
+	<resultMap type="com.boman.system.domain.SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 	</insert>
 
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+	<delete id="deleteUserRoleInfo" parameterType="com.boman.system.domain.SysUserRole">
 		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 
@@ -62,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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 id="selectUserIdsByRoleId" resultType="Long">
+		select user_id from sys_user_role where role_id = #{roleId}
 	</select>
+
 </mapper> 

boman-web-core/src/main/java/com/boman/web/core/controller/CommonController.java

@@ -93,7 +93,7 @@ public class CommonController {
      * @param dto dto
      * @return int
      */
-    @PostMapping("insertList")
+    @PostMapping("/insertList")
     public int insertList(@RequestBody InsertListDto dto) {
         return commonService.insertList(dto);
     }