From bd6eb16124e62d5114e74f6473a9d31c41224952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Tue, 1 Jun 2021 00:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BA=E5=8F=8A=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/api/modular/system/userManage.js     | 15 +++++
 _web/src/views/system/user/index.vue          | 64 ++++++++++++++-----
 .../user/controller/SysUserController.java    |  7 +-
 .../modular/user/service/SysUserService.java  |  6 +-
 .../user/service/impl/SysUserServiceImpl.java | 60 ++++++++---------
 5 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/_web/src/api/modular/system/userManage.js b/_web/src/api/modular/system/userManage.js
index 3dce14c9..9935b8fb 100644
--- a/_web/src/api/modular/system/userManage.js
+++ b/_web/src/api/modular/system/userManage.js
@@ -70,6 +70,21 @@ export function sysUserDelete (parameter) {
   })
 }
 
+/**
+ * 导出用户
+ *
+ * @author yubaoshan
+ * @date 2021/5/30 00:23
+ */
+export function sysUserExport (parameter) {
+  return axios({
+    url: '/sysUser/export',
+    method: 'get',
+    params: parameter,
+    responseType: 'blob'
+  })
+}
+
 /**
  * 拥有角色
  *
diff --git a/_web/src/views/system/user/index.vue b/_web/src/views/system/user/index.vue
index f71db18b..2893fbf0 100644
--- a/_web/src/views/system/user/index.vue
+++ b/_web/src/views/system/user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-row :gutter="24" >
+  <a-row :gutter="24">
     <a-col :md="5" :sm="24">
       <a-card :bordered="false" :loading="treeLoading">
         <div v-if="this.orgTree != ''">
@@ -46,12 +46,18 @@
           ref="table"
           :columns="columns"
           :data="loadData"
-          :alert="true"
+          :alert="options.alert"
           :rowKey="(record) => record.id"
-          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :rowSelection="options.rowSelection"
         >
-          <template slot="operator" v-if="hasPerm('sysUser:add')">
+          <template slot="operator">
             <a-button type="primary" v-if="hasPerm('sysUser:add')" icon="plus" @click="$refs.addForm.add()">新增用户</a-button>
+            <a-button type="danger" :disabled="selectedRowKeys.length < 1" v-if="hasPerm('sysUser:delete')" @click="batchDelete"><a-icon type="delete"/>批量删除</a-button>
+            <x-down
+              v-if="hasPerm('sysUser:export')"
+              ref="batchExport"
+              @batchExport="batchExport"
+            />
           </template>
           <span slot="sex" slot-scope="text">
             {{ sexFilter(text) }}
@@ -84,7 +90,7 @@
                   <a @click="$refs.userOrgForm.userOrg(record)">授权数据</a>
                 </a-menu-item>
                 <a-menu-item v-if="hasPerm('sysUser:delete')">
-                  <a-popconfirm placement="topRight" title="确认删除？" @confirm="() => sysUserDelete(record)">
+                  <a-popconfirm placement="topRight" title="确认删除？" @confirm="() => singleDelete(record)">
                     <a>删除</a>
                   </a-popconfirm>
                 </a-menu-item>
@@ -101,10 +107,10 @@
   </a-row>
 </template>
 <script>
-  import { STable, XCard } from '@/components'
+  import { STable, XCard, XDown } from '@/components'
   import { Empty } from 'ant-design-vue'
   import { getOrgTree } from '@/api/modular/system/orgManage'
-  import { getUserPage, sysUserDelete, sysUserChangeStatus, sysUserResetPwd } from '@/api/modular/system/userManage'
+  import { getUserPage, sysUserDelete, sysUserChangeStatus, sysUserResetPwd, sysUserExport } from '@/api/modular/system/userManage'
   import { sysDictTypeDropDown } from '@/api/modular/system/dictManage'
   import addForm from './addForm'
   import editForm from './editForm'
@@ -112,6 +118,7 @@
   import userOrgForm from './userOrgForm'
   export default {
     components: {
+      XDown,
       XCard,
       STable,
       addForm,
@@ -121,8 +128,6 @@
     },
     data () {
       return {
-        // 高级搜索 展开/关闭
-        advanced: false,
         // 查询参数
         queryParam: {},
         // 表头
@@ -165,6 +170,13 @@
         simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
         replaceFields: {
           key: 'id'
+        },
+        options: {
+          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+          rowSelection: {
+            selectedRowKeys: this.selectedRowKeys,
+            onChange: this.onSelectChange
+          }
         }
       }
     },
@@ -257,11 +269,26 @@
         })
       },
       /**
-       * 删除用户
-       * @param record
+       * 单个删除
        */
-      sysUserDelete (record) {
-        sysUserDelete(record).then((res) => {
+      singleDelete (record) {
+        const param = [{ 'id': record.id }]
+        this.sysUserDelete(param)
+      },
+      /**
+       * 批量删除
+       */
+      batchDelete () {
+        const paramIds = this.selectedRowKeys.map((d) => {
+          return { 'id': d }
+        })
+        this.sysUserDelete(paramIds)
+      },
+      /**
+       * 删除用户
+       */
+      sysUserDelete (param) {
+        sysUserDelete(param).then((res) => {
           if (res.success) {
             this.$message.success('删除成功')
             this.$refs.table.refresh()
@@ -272,6 +299,14 @@
           this.$message.error('删除错误：' + err.message)
         })
       },
+      /**
+       * 批量导出
+       */
+      batchExport () {
+        sysUserExport().then((res) => {
+          this.$refs.batchExport.downloadfile(res)
+        })
+      },
       /**
        * 点击左侧机构树查询列表
        */
@@ -281,9 +316,6 @@
         }
         this.$refs.table.refresh(true)
       },
-      toggleAdvanced () {
-        this.advanced = !this.advanced
-      },
       handleOk () {
         this.$refs.table.refresh()
       },
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java
index 43529503..6777d2a3 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java
@@ -39,6 +39,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 系统用户控制器
@@ -84,15 +85,15 @@ public class SysUserController {
     /**
      * 删除系统用户
      *
-     * @author xuyuxiang
+     * @author xuyuxiang yubaoshan
      * @date 2020/3/23 16:28
      */
     @Permission
     @DataScope
     @PostMapping("/sysUser/delete")
     @BusinessLog(title = "系统用户_删除", opType = LogAnnotionOpTypeEnum.DELETE)
-    public ResponseData delete(@RequestBody @Validated(SysUserParam.delete.class) SysUserParam sysUserParam) {
-        sysUserService.delete(sysUserParam);
+    public ResponseData delete(@RequestBody @Validated(SysUserParam.delete.class) List<SysUserParam> sysUserParamList) {
+        sysUserService.delete(sysUserParamList);
         return new SuccessResponseData();
     }
 
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
index e705782c..8c63d5dd 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
@@ -84,11 +84,11 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 删除系统用户
      *
-     * @param sysUserParam 删除参数
-     * @author xuyuxiang
+     * @param sysUserParamList 删除集合
+     * @author xuyuxiang yubaosahn
      * @date 2020/3/23 9:26
      */
-    void delete(SysUserParam sysUserParam);
+    void delete(List<SysUserParam> sysUserParamList);
 
     /**
      * 编辑系统用户
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
index a9f94981..39da8b0b 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
@@ -201,38 +201,40 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void delete(SysUserParam sysUserParam) {
-        SysUser sysUser = this.querySysUser(sysUserParam);
-        //不能删除超级管理员
-        if (AdminTypeEnum.SUPER_ADMIN.getCode().equals(sysUser.getAdminType())) {
-            throw new ServiceException(SysUserExceptionEnum.USER_CAN_NOT_DELETE_ADMIN);
-        }
-        boolean superAdmin = LoginContextHolder.me().isSuperAdmin();
-        //如果登录用户不是超级管理员，则进行数据权限校验
-        if (!superAdmin) {
-            List<Long> dataScope = sysUserParam.getDataScope();
-            //获取要删除的用户的所属机构
-            SysEmpInfo sysEmpInfo = sysEmpService.getSysEmpInfo(sysUser.getId());
-            Long orgId = sysEmpInfo.getOrgId();
-            //数据范围为空
-            if (ObjectUtil.isEmpty(dataScope)) {
-                throw new PermissionException(PermissionExceptionEnum.NO_PERMISSION_OPERATE);
-            } else if (!dataScope.contains(orgId)) {
-                //所要删除的用户的所属机构不在自己的数据范围内
-                throw new PermissionException(PermissionExceptionEnum.NO_PERMISSION_OPERATE);
+    public void delete(List<SysUserParam> sysUserParamList) {
+        sysUserParamList.forEach(sysUserParam -> {
+            SysUser sysUser = this.querySysUser(sysUserParam);
+            //不能删除超级管理员
+            if (AdminTypeEnum.SUPER_ADMIN.getCode().equals(sysUser.getAdminType())) {
+                throw new ServiceException(SysUserExceptionEnum.USER_CAN_NOT_DELETE_ADMIN);
             }
-        }
-        sysUser.setStatus(CommonStatusEnum.DELETED.getCode());
-        this.updateById(sysUser);
-        Long id = sysUser.getId();
-        //删除该用户对应的员工表信息
-        sysEmpService.deleteEmpInfoByUserId(id);
+            boolean superAdmin = LoginContextHolder.me().isSuperAdmin();
+            //如果登录用户不是超级管理员，则进行数据权限校验
+            if (!superAdmin) {
+                List<Long> dataScope = sysUserParam.getDataScope();
+                //获取要删除的用户的所属机构
+                SysEmpInfo sysEmpInfo = sysEmpService.getSysEmpInfo(sysUser.getId());
+                Long orgId = sysEmpInfo.getOrgId();
+                //数据范围为空
+                if (ObjectUtil.isEmpty(dataScope)) {
+                    throw new PermissionException(PermissionExceptionEnum.NO_PERMISSION_OPERATE);
+                } else if (!dataScope.contains(orgId)) {
+                    //所要删除的用户的所属机构不在自己的数据范围内
+                    throw new PermissionException(PermissionExceptionEnum.NO_PERMISSION_OPERATE);
+                }
+            }
+            sysUser.setStatus(CommonStatusEnum.DELETED.getCode());
+            this.updateById(sysUser);
+            Long id = sysUser.getId();
+            //删除该用户对应的员工表信息
+            sysEmpService.deleteEmpInfoByUserId(id);
 
-        //删除该用户对应的用户-角色表关联信息
-        sysUserRoleService.deleteUserRoleListByUserId(id);
+            //删除该用户对应的用户-角色表关联信息
+            sysUserRoleService.deleteUserRoleListByUserId(id);
 
-        //删除该用户对应的用户-数据范围表关联信息
-        sysUserDataScopeService.deleteUserDataScopeListByUserId(id);
+            //删除该用户对应的用户-数据范围表关联信息
+            sysUserDataScopeService.deleteUserDataScopeListByUserId(id);
+        });
     }
 
     @Transactional(rollbackFor = Exception.class)