员工列表 增加部门

admin-web/src/models/admin/adminList.js

-import {message} from 'antd';
-import {buildTreeNode, findCheckedKeys} from '../../utils/tree.utils';
+import { message } from 'antd';
+import { buildTreeNode, findCheckedKeys } from '../../utils/tree.utils';
 import {
   addAdmin,
   adminRoleAssign,
@@ -8,14 +8,30 @@ import {
   queryAdminRoleList,
   updateAdmin,
   updateAdminStatus,
+  deptTreeAll,
 } from '../../services/admin';
-import {arrayToStringParams} from '../../utils/request.qs';
+import { arrayToStringParams } from '../../utils/request.qs';
 import PaginationHelper from '../../../helpers/PaginationHelper';
 
 const SEARCH_PARAMS_DEFAULT = {
   nickname: '',
 };
 
+const buildSelectTree = list => {
+  return list.map(item => {
+    let children = [];
+    if (item.children) {
+      children = buildSelectTree(item.children);
+    }
+    return {
+      title: item.name,
+      value: `${item.name}-${item.id}`,
+      key: item.id,
+      children,
+    };
+  });
+};
+
 export default {
   namespace: 'adminList',
 
@@ -37,11 +53,22 @@ export default {
     roleModalVisible: false,
     roleCheckedKeys: [], // 此处的 Key ，就是角色编号
     roleAssignLoading: false,
+
+    //部门相关
+    deptSelectTree: [],
   },
 
   effects: {
+    *getDeptmentTree({ payload }, { call, put }) {
+      const result = yield call(deptTreeAll, payload);
+      yield put({
+        type: 'treeSuccess',
+        payload: result.data,
+      });
+    },
+
     // 查询列表
-    * query({ payload }, { call, put }) {
+    *query({ payload }, { call, put }) {
       // 显示加载中
       yield put({
         type: 'changeListLoading',
@@ -57,8 +84,8 @@ export default {
           list: response.data.list,
           pagination: PaginationHelper.formatPagination(response.data, payload),
           searchParams: {
-            nickname: payload.nickname || ''
-          }
+            nickname: payload.nickname || '',
+          },
         },
       });
 
@@ -68,7 +95,7 @@ export default {
         payload: false,
       });
     },
-    * add({ payload }, { call, put }) {
+    *add({ payload }, { call, put }) {
       // 显示加载中
       yield put({
         type: 'changeModalLoading',
@@ -87,7 +114,7 @@ export default {
         yield put({
           type: 'query',
           payload: {
-            ...PaginationHelper.defaultPayload
+            ...PaginationHelper.defaultPayload,
           },
         });
       }
@@ -98,7 +125,7 @@ export default {
         payload: false,
       });
     },
-    * update({ payload }, { call, put }) {
+    *update({ payload }, { call, put }) {
       const { callback, body } = payload;
       // 显示加载中
       yield put({
@@ -117,7 +144,7 @@ export default {
         yield put({
           type: 'query',
           payload: {
-            ...PaginationHelper.defaultPayload
+            ...PaginationHelper.defaultPayload,
           },
         });
       }
@@ -129,7 +156,7 @@ export default {
       });
     },
 
-    * updateStatus({ payload }, { call, put }) {
+    *updateStatus({ payload }, { call, put }) {
       // 请求
       const response = yield call(updateAdminStatus, payload);
       // 响应
@@ -139,13 +166,13 @@ export default {
         yield put({
           type: 'query',
           payload: {
-            ...PaginationHelper.defaultPayload
+            ...PaginationHelper.defaultPayload,
           },
         });
       }
     },
 
-    * delete({ payload }, { call, put }) {
+    *delete({ payload }, { call, put }) {
       // 请求
       const response = yield call(deleteAdmin, payload);
       // 响应
@@ -155,13 +182,13 @@ export default {
         yield put({
           type: 'query',
           payload: {
-            ...PaginationHelper.defaultPayload
+            ...PaginationHelper.defaultPayload,
           },
         });
       }
     },
 
-    * queryRoleList({ payload }, { call, put }) {
+    *queryRoleList({ payload }, { call, put }) {
       // 显示加载中
       yield put({
         type: 'changeRoleAssignLoading',
@@ -191,7 +218,7 @@ export default {
       });
     },
 
-    * roleAssign({ payload }, { call, put }) {
+    *roleAssign({ payload }, { call, put }) {
       const { callback, body } = payload;
       // 显示加载中
       yield put({
@@ -220,6 +247,27 @@ export default {
   },
 
   reducers: {
+    treeSuccess(state, { payload }) {
+      const resultData = payload;
+      const treeData = buildSelectTree(resultData);
+
+      // // value 要保护 displayName 不然，搜索会失效
+      // const rootNode = [
+      //   {
+      //     title: '根节点',
+      //     value: `根节点-0`,
+      //     key: 0,
+      //     children: [],
+      //   },
+      // ];
+
+      // const deptSelectTree = rootNode.concat(treeData);
+      return {
+        ...state,
+        // list: resultData,
+        deptSelectTree: treeData,
+      };
+    },
     changeRoleCheckedKeys(state, { payload }) {
       return {
         ...state,
@@ -251,6 +299,6 @@ export default {
         ...state,
         ...payload,
       };
-    }
+    },
   },
 };

docs/sql/mall_admin.sql

@@ -50,6 +50,7 @@ CREATE TABLE `admin` (
   `nickname` varchar(10) NOT NULL COMMENT '昵称',
   `password` varchar(32) NOT NULL COMMENT '密码\n     *\n     * TODO 芋艿 暂时最简单的 MD5',
   `status` tinyint(11) NOT NULL COMMENT '账号状态',
+  `deptment_id` int(11) DEFAULT 0 NOT NULL '部门id',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `deleted` bit(1) DEFAULT NULL,

system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java

@@ -5,8 +5,10 @@ import cn.iocoder.common.framework.util.CollectionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.admin.api.AdminService;
+import cn.iocoder.mall.admin.api.DeptmentService;
 import cn.iocoder.mall.admin.api.ResourceService;
 import cn.iocoder.mall.admin.api.RoleService;
+import cn.iocoder.mall.admin.api.bo.deptment.DeptmentBO;
 import cn.iocoder.mall.admin.api.bo.resource.ResourceBO;
 import cn.iocoder.mall.admin.api.bo.role.RoleBO;
 import cn.iocoder.mall.admin.api.bo.admin.AdminBO;
@@ -23,6 +25,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -44,6 +47,9 @@ public class AdminController {
     @Reference(validation = "true", version = "${dubbo.provider.RoleService.version}")
     private RoleService roleService;
 
+    @Autowired
+    private DeptmentService deptmentService;
+
     // =========== 当前管理员相关的资源 API ===========
 
     // TODO 功能：当前管理员
@@ -97,7 +103,17 @@ public class AdminController {
             // 查询角色数组
             Map<Integer, Collection<RoleBO>> roleMap = adminService.getAdminRolesMap(CollectionUtil.convertList(resultPage.getList(), AdminBO::getId));
             resultPage.getList().forEach(admin -> admin.setRoles(AdminConvert.INSTANCE.convertAdminVORoleList(roleMap.get(admin.getId()))));
+
+            // 查询对应部门
+            List<DeptmentBO> deptmentBOS =  deptmentService.getAllDeptments();
+            Map<Integer, String> deptNameMap = deptmentBOS.stream().collect(Collectors.toMap(d->d.getId(), d->d.getName()));
+            //管理员所在部门被删后，变成未分配状态
+            deptNameMap.put(0, "未分配");
+            resultPage.getList().forEach(admin->{
+                admin.setDeptment(new AdminVO.Deptment(admin.getDeptmentId(), deptNameMap.get(admin.getDeptmentId())));
+            });
         }
+
         return success(resultPage);
     }
 

system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/admin/AdminVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.mall.admin.application.vo.admin;
 import cn.iocoder.mall.admin.api.bo.admin.AdminBO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -15,6 +16,8 @@ public class AdminVO extends AdminBO {
 
     private List<Role> roles;
 
+    private Deptment deptment;
+
     @ApiModel("管理员 VO - 角色")
     @Data
     @Accessors(chain = true)
@@ -28,4 +31,19 @@ public class AdminVO extends AdminBO {
 
     }
 
+    @ApiModel("管理员 VO - 部门")
+    @Data
+    @Accessors(chain = true)
+    @AllArgsConstructor
+    public static class Deptment {
+
+        @ApiModelProperty(value = "部门编号", required = true, example = "1")
+        private Integer id;
+
+        @ApiModelProperty(value = "部门名称", required = true, example = "研发部")
+        private String name;
+
+
+    }
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/admin/AdminBO.java

@@ -28,4 +28,7 @@ public class AdminBO implements Serializable {
     @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
     private Date createTime;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminAddDTO.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
@@ -31,4 +32,8 @@ public class AdminAddDTO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    @NotNull(message = "部门不能为空")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminPageDTO.java

@@ -17,4 +17,8 @@ public class AdminPageDTO extends PageParam {
     @ApiModelProperty(value = "昵称，模糊匹配", example = "小王")
     private String nickname;
 
+
+    @ApiModelProperty(value = "所在部门ID")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminUpdateDTO.java

@@ -35,4 +35,8 @@ public class AdminUpdateDTO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    @NotNull(message = "部门不能为空")
+    private Integer deptmentId;
+
 }

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.omg.PortableInterceptor.INACTIVE;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -19,7 +20,14 @@ public interface AdminMapper extends BaseMapper<AdminDO> {
 
     default IPage<AdminDO> selectPage(AdminPageDTO adminPageDTO) {
         return selectPage(new Page<>(adminPageDTO.getPageNo(), adminPageDTO.getPageSize()),
-                new QueryWrapperX<AdminDO>().likeIfPresent("nickname", adminPageDTO.getNickname()));
+                new QueryWrapperX<AdminDO>().likeIfPresent("nickname", adminPageDTO.getNickname())
+                                            .eqIfPresent("deptment_id", adminPageDTO.getDeptmentId()));
+    }
+
+    default int updateDeptByDeptId(@Param("fromDeptId")Integer fromDeptId, @Param("toDeptId")Integer toDeptId){
+        QueryWrapper<AdminDO> query = new QueryWrapper<AdminDO>()
+                .eq("deptment_id", fromDeptId);
+        return update(new AdminDO().setDeptmentId(toDeptId), query);
     }
 
 }

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java

@@ -36,6 +36,12 @@ public class AdminDO extends DeletableDO {
      */
     private Integer status;
 
+    /**
+     * 管理员部门id
+     */
+    private Integer deptmentId;
+
+
     // TODO 芋艿，最后登陆时间、最后登陆 IP
     // TODO 芋艿，登陆日志
 

system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/DeptmentServiceImpl.java

@@ -11,6 +11,7 @@ import cn.iocoder.mall.admin.api.dto.depetment.DeptmentAddDTO;
 import cn.iocoder.mall.admin.api.dto.depetment.DeptmentPageDTO;
 import cn.iocoder.mall.admin.api.dto.depetment.DeptmentUpdateDTO;
 import cn.iocoder.mall.admin.convert.DeptmentConvert;
+import cn.iocoder.mall.admin.dao.AdminMapper;
 import cn.iocoder.mall.admin.dao.DeptmentMapper;
 import cn.iocoder.mall.admin.dao.DeptmentRoleMapper;
 import cn.iocoder.mall.admin.dataobject.DeptmentDO;
@@ -39,6 +40,9 @@ public class DeptmentServiceImpl implements DeptmentService {
     @Autowired
     private DeptmentRoleMapper deptmentRoleMapper;
 
+    @Autowired
+    private AdminMapper adminMapper;
+
     @Override
     public DeptmentBO addDeptment(Integer adminId, DeptmentAddDTO deptmentAddDTO) {
         if (deptmentAddDTO.getPid() != 0 &&
@@ -69,6 +73,8 @@ public class DeptmentServiceImpl implements DeptmentService {
 
         deptmentRoleMapper.deleteByDeptmentId(deptmentId);
 
+        //将改部门下所有员工的DeptmentID设置为0
+        adminMapper.updateDeptByDeptId(deptmentId, 0);
         return true;
     }