用户管理

back-ui/src/api/system/user.js

@@ -10,6 +10,15 @@ export function listUser(query) {
   })
 }
 
+// 查询用户列表
+export function listCard(query) {
+  return request({
+    url: '/system/user/listCard',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({
@@ -134,3 +143,11 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+// 查询省份列表（去重）
+export function getLocationList() {
+  return request({
+    url: '/system/user/locations',
+    method: 'get'
+  })
+}

back-ui/src/views/system/user/index.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <splitpanes :horizontal="appStore.device === 'mobile'" class="default-theme">
         <!--机构数据-->
-        <!-- <pane size="16">
+        <pane size="16">
           <el-col>
             <div class="head-container">
               <el-input v-model="deptName" placeholder="请输入机构名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
@@ -12,16 +12,16 @@
               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
             </div>
           </el-col>
-        </pane> -->
+        </pane>
         <!--用户数据-->
-        <pane size="100">
+        <pane size="84">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
               <el-form-item label="用户名称" prop="userName">
                 <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item label="用户类型" prop="userType">
-                <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable style="width: 240px">
+                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
                   <el-option v-for="dict in user_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
@@ -64,30 +64,15 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="省份" align="center" key="location" prop="location" />
-              <el-table-column label="单招年份" align="center" key="endYear" prop="endYear" />
-              <el-table-column label="注册学校" align="center" key="schoolName" prop="schoolName" />
-              <el-table-column label="学校班级" align="center" key="schoolClassName" prop="schoolClassName" />
-              <el-table-column label="培训校区" align="center" key="campusName" prop="campusName" />
-              <el-table-column label="校区班级" align="center" key="campusClassName" prop="campusClassName" />
-              <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
-              <el-table-column label="卡号" align="center" key="cardNo" prop="cardNo" />
-              <!-- <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" /> -->
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
               <el-table-column label="用户类型" align="center" key="userType" v-if="columns.status.visible">
                 <template #default="scope">
                   <dict-tag :options="user_type" :value="scope.row.userType" />
                 </template>
               </el-table-column>
-              <el-table-column label="考生类型" align="center" key="examType" v-if="columns.examType.visible">
-                <template #default="scope">
-                  <dict-tag :options="exam_type" :value="scope.row.examType" />
-                </template>
-              </el-table-column>
-              <el-table-column label="平台机构" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="代理商" align="center" key="deptName" prop="deptName" />
-              <el-table-column label="邀请码" align="center" key="inviteCode" prop="inviteCode" />
-
+              <el-table-column label="机构" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
               <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
                 <template #default="scope">
                   <el-switch
@@ -120,7 +105,7 @@
                 </template>
               </el-table-column>
             </el-table>
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" />
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
           </el-col>
         </pane>
       </splitpanes>
@@ -248,7 +233,7 @@ import "splitpanes/dist/splitpanes.css"
 const router = useRouter()
 const appStore = useAppStore()
 const { proxy } = getCurrentInstance()
-const { sys_normal_disable, sys_user_sex, user_type, exam_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type", "exam_type")
+const { sys_normal_disable, sys_user_sex, user_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type")
 
 const userList = ref([])
 const open = ref(false)
@@ -289,7 +274,6 @@ const columns = ref({
   deptName: { label: '机构', visible: true },
   phonenumber: { label: '手机号码', visible: true },
   status: { label: '状态', visible: true },
-  examType: { label: '考生类型', visible: true },
   createTime: { label: '创建时间', visible: true }
 })
 
@@ -299,7 +283,6 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
-    userType: undefined,
     phonenumber: undefined,
     status: undefined,
     deptId: undefined
@@ -336,13 +319,6 @@ function getList() {
   })
 }
 
-/** 分页事件处理 */
-function handlePagination(pagination) {
-  queryParams.value.pageNum = pagination.page
-  queryParams.value.pageSize = pagination.limit
-  getList()
-}
-
 /** 查询机构下拉树结构 */
 function getDeptTree() {
   deptTreeSelect().then(response => {
@@ -591,42 +567,3 @@ onMounted(() => {
   })
 })
 </script>
-
-<style scoped>
-/* 确保 splitpanes 的 pane 可以滚动 */
-:deep(.splitpanes__pane) {
-  overflow: auto !important;
-  height: 100%;
-}
-
-/* 确保 el-col 内容正常显示，不被遮挡 */
-:deep(.splitpanes__pane .el-col) {
-  padding: 0;
-  overflow: visible;
-}
-
-/* 确保表格容器可以正常显示滚动条 */
-.app-container {
-  height: 100%;
-}
-
-.app-container .el-row {
-  height: 100%;
-}
-
-.app-container .el-table {
-  width: 100%;
-}
-
-/* 确保表格内容区域可以滚动 */
-:deep(.el-table__body-wrapper) {
-  overflow-x: auto !important;
-}
-
-/* 确保按钮区域有足够的空间，不被遮挡 */
-.mb8 {
-  margin-bottom: 8px;
-  position: relative;
-  z-index: 1;
-}
-</style>

back-ui/src/views/system/user/indexCard.vue

@@ -0,0 +1,667 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <splitpanes :horizontal="appStore.device === 'mobile'" class="default-theme">
+        <!--机构数据-->
+        <!-- <pane size="16">
+          <el-col>
+            <div class="head-container">
+              <el-input v-model="deptName" placeholder="请输入机构名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+            </div>
+            <div class="head-container">
+              <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
+            </div>
+          </el-col>
+        </pane> -->
+        <!--用户数据-->
+        <pane size="100">
+          <el-col>
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+              <el-form-item label="省份" prop="location">
+                <el-select v-model="queryParams.location" placeholder="请选择省份" clearable filterable style="width: 240px">
+                  <el-option v-for="location in locationOptions" :key="location" :label="location" :value="location" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="单招年份" prop="endYear">
+                <el-input v-model="queryParams.endYear" placeholder="请输入单招年份" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="姓名" prop="nickName">
+                <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="手机号" prop="phonenumber">
+                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="考生类型" prop="examType">
+                <el-select v-model="queryParams.examType" placeholder="请选择考生类型" clearable style="width: 240px">
+                  <el-option v-for="dict in exam_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="平台机构" prop="deptId">
+                <IeInstitutionSelect v-model="queryParams.deptId" placeholder="请选择平台机构" clearable style="width: 240px" />
+              </el-form-item>
+              <el-form-item label="代理商" prop="deptName">
+                <el-input v-model="queryParams.deptName" placeholder="请输入代理商" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="邀请码" prop="inviteCode">
+                <el-input v-model="queryParams.inviteCode" placeholder="请输入邀请码" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+              <!-- <el-col :span="1.5">
+                <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+              </el-col>
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+            </el-row>
+
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
+              <el-table-column label="省份" align="center" key="location" prop="location" />
+              <el-table-column label="单招年份" align="center" key="endYear" prop="endYear" />
+              <el-table-column label="注册学校" align="center" key="schoolName" prop="schoolName" />
+              <el-table-column label="学校班级" align="center" key="schoolClassName" prop="schoolClassName" />
+              <el-table-column label="培训校区" align="center" key="campusName" prop="campusName" />
+              <el-table-column label="校区班级" align="center" key="campusClassName" prop="campusClassName" />
+              <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column label="卡号" align="center" key="cardNo" prop="cardNo" />
+              <!-- <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" /> -->
+              <el-table-column label="用户类型" align="center" key="userType" v-if="columns.status.visible">
+                <template #default="scope">
+                  <dict-tag :options="user_type" :value="scope.row.userType" />
+                </template>
+              </el-table-column>
+              <el-table-column label="考生类型" align="center" key="examType" v-if="columns.examType.visible">
+                <template #default="scope">
+                  <dict-tag :options="exam_type" :value="scope.row.examType" />
+                </template>
+              </el-table-column>
+              <el-table-column label="平台机构" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="代理商" align="center" key="deptName" prop="deptName" />
+              <el-table-column label="邀请码" align="center" key="inviteCode" prop="inviteCode" />
+
+              <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
+                <template #default="scope">
+                  <el-switch
+                    v-model="scope.row.status"
+                    active-value="0"
+                    inactive-value="1"
+                    @change="handleStatusChange(scope.row)"
+                  ></el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+                <template #default="scope"> -->
+                  <!-- <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip> -->
+                  <!-- <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                  </el-tooltip>
+                  <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                  </el-tooltip>
+                  <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip> -->
+                <!-- </template>
+              </el-table-column> -->
+            </el-table>
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" />
+          </el-col>
+        </pane>
+      </splitpanes>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属机构" prop="deptId">
+              <el-tree-select v-model="form.deptId" :data="enabledDeptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属机构" clearable check-strictly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择">
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择">
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :on-change="handleFileChange" :on-remove="handleFileRemove" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <div class="el-upload__tip">
+              <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+            </div>
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="User">
+import { getToken } from "@/utils/auth"
+import useAppStore from '@/store/modules/app'
+import { changeUserStatus, listCard, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect, getLocationList } from "@/api/system/user"
+import { Splitpanes, Pane } from "splitpanes"
+import "splitpanes/dist/splitpanes.css"
+import IeInstitutionSelect from '@/components/IeInstitutionSelect/index.vue'
+
+const router = useRouter()
+const appStore = useAppStore()
+const { proxy } = getCurrentInstance()
+const { sys_normal_disable, sys_user_sex, user_type, exam_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type", "exam_type")
+
+const userList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const dateRange = ref([])
+const deptName = ref("")
+const deptOptions = ref(undefined)
+const enabledDeptOptions = ref(undefined)
+const initPassword = ref(undefined)
+const postOptions = ref([])
+const roleOptions = ref([])
+const locationOptions = ref([])
+/*** 用户导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+})
+// 列显隐信息
+const columns = ref({
+  userId: { label: '用户编号', visible: true },
+  userName: { label: '用户名称', visible: true },
+  nickName: { label: '用户昵称', visible: true },
+  deptName: { label: '机构', visible: true },
+  phonenumber: { label: '手机号码', visible: true },
+  status: { label: '状态', visible: true },
+  examType: { label: '考生类型', visible: true },
+  createTime: { label: '创建时间', visible: true }
+})
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    location: undefined,
+    endYear: undefined,
+    nickName: undefined,
+    phonenumber: undefined,
+    examType: undefined,
+    deptId: undefined,
+    deptName: undefined,
+    inviteCode: undefined
+  },
+  rules: {
+    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
+    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 通过条件过滤节点  */
+const filterNode = (value, data) => {
+  if (!value) return true
+  return data.label.indexOf(value) !== -1
+}
+
+/** 根据名称筛选机构树 */
+watch(deptName, val => {
+  proxy.$refs["deptTreeRef"].filter(val)
+})
+
+/** 查询用户列表 */
+function getList() {
+  loading.value = true
+  // 自动添加 userType='01' 参数
+  const params = {
+    ...queryParams.value,
+    userType: '01'
+  }
+  listCard(proxy.addDateRange(params, dateRange.value)).then(res => {
+    loading.value = false
+    userList.value = res.rows
+    total.value = res.total
+  })
+}
+
+/** 分页事件处理 */
+function handlePagination(pagination) {
+  queryParams.value.pageNum = pagination.page
+  queryParams.value.pageSize = pagination.limit
+  getList()
+}
+
+/** 查询机构下拉树结构 */
+function getDeptTree() {
+  deptTreeSelect().then(response => {
+    deptOptions.value = response.data
+    enabledDeptOptions.value = filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
+  })
+}
+
+/** 过滤禁用的机构 */
+function filterDisabledDept(deptList) {
+  return deptList.filter(dept => {
+    if (dept.disabled) {
+      return false
+    }
+    if (dept.children && dept.children.length) {
+      dept.children = filterDisabledDept(dept.children)
+    }
+    return true
+  })
+}
+
+/** 节点单击事件 */
+function handleNodeClick(data) {
+  queryParams.value.deptId = data.id
+  handleQuery()
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  queryParams.value.location = undefined
+  queryParams.value.endYear = undefined
+  queryParams.value.nickName = undefined
+  queryParams.value.phonenumber = undefined
+  queryParams.value.examType = undefined
+  queryParams.value.deptId = undefined
+  queryParams.value.deptName = undefined
+  queryParams.value.inviteCode = undefined
+  handleQuery()
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const userIds = row.userId || ids.value
+  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+    return delUser(userIds)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  // 自动添加 userType='01' 参数
+  const params = {
+    ...queryParams.value,
+    userType: '01'
+  }
+  proxy.download("system/user/export", params, `user_${new Date().getTime()}.xlsx`)
+}
+
+/** 用户状态修改  */
+function handleStatusChange(row) {
+  let text = row.status === "0" ? "启用" : "停用"
+  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+    return changeUserStatus(row.userId, row.status)
+  }).then(() => {
+    proxy.$modal.msgSuccess(text + "成功")
+  }).catch(function () {
+    row.status = row.status === "0" ? "1" : "0"
+  })
+}
+
+/** 更多操作 */
+function handleCommand(command, row) {
+  switch (command) {
+    case "handleResetPwd":
+      handleResetPwd(row)
+      break
+    case "handleAuthRole":
+      handleAuthRole(row)
+      break
+    default:
+      break
+  }
+}
+
+/** 跳转角色分配 */
+function handleAuthRole(row) {
+  const userId = row.userId
+  router.push("/system/user-auth/role/" + userId)
+}
+
+/** 重置密码按钮操作 */
+function handleResetPwd(row) {
+  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    closeOnClickModal: false,
+    inputPattern: /^.{5,20}$/,
+    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputValidator: (value) => {
+      if (/<|>|"|'|\||\\/.test(value)) {
+        return "不能包含非法字符：< > \" ' \\\ |"
+      }
+    },
+  }).then(({ value }) => {
+    resetUserPwd(row.userId, value).then(response => {
+      proxy.$modal.msgSuccess("修改成功，新密码是：" + value)
+    })
+  }).catch(() => {})
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.userId)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "用户导入"
+  upload.open = true
+  upload.selectedFile = null
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download("system/user/importTemplate", {
+  }, `user_template_${new Date().getTime()}.xlsx`)
+}
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件选择处理 */
+const handleFileChange = (file, fileList) => {
+  upload.selectedFile = file
+}
+
+/** 文件删除处理 */
+const handleFileRemove = (file, fileList) => {
+  upload.selectedFile = null
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs["uploadRef"].handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  const file = upload.selectedFile
+  if (!file || file.length === 0 || !file.name.toLowerCase().endsWith('.xls') && !file.name.toLowerCase().endsWith('.xlsx')) {
+    proxy.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
+    return
+  }
+  proxy.$refs["uploadRef"].submit()
+}
+
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    userId: undefined,
+    deptId: undefined,
+    userName: undefined,
+    nickName: undefined,
+    password: undefined,
+    phonenumber: undefined,
+    email: undefined,
+    sex: undefined,
+    status: "0",
+    remark: undefined,
+    postIds: [],
+    roleIds: []
+  }
+  proxy.resetForm("userRef")
+}
+
+/** 取消按钮 */
+function cancel() {
+  open.value = false
+  reset()
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  getUser().then(response => {
+    postOptions.value = response.posts
+    roleOptions.value = response.roles
+    open.value = true
+    title.value = "添加用户"
+    form.value.password = initPassword.value
+  })
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const userId = row.userId || ids.value
+  getUser(userId).then(response => {
+    form.value = response.data
+    postOptions.value = response.posts
+    roleOptions.value = response.roles
+    form.value.postIds = response.postIds
+    form.value.roleIds = response.roleIds
+    open.value = true
+    title.value = "修改用户"
+    form.password = ""
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["userRef"].validate(valid => {
+    if (valid) {
+      if (form.value.userId != undefined) {
+        updateUser(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addUser(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 获取省份列表 */
+function loadLocationList() {
+  getLocationList().then(response => {
+    locationOptions.value = response.data || []
+  })
+}
+
+onMounted(() => {
+  getDeptTree()
+  loadLocationList()
+  getList()
+  proxy.getConfigKey("sys.user.initPassword").then(response => {
+    initPassword.value = response.msg
+  })
+})
+</script>
+
+<style scoped>
+/* 确保 splitpanes 的 pane 可以滚动 */
+:deep(.splitpanes__pane) {
+  overflow: auto !important;
+  height: 100%;
+}
+
+/* 确保 el-col 内容正常显示，不被遮挡 */
+:deep(.splitpanes__pane .el-col) {
+  padding: 0;
+  overflow: visible;
+}
+
+/* 确保表格容器可以正常显示滚动条 */
+.app-container {
+  height: 100%;
+}
+
+.app-container .el-row {
+  height: 100%;
+}
+
+.app-container .el-table {
+  width: 100%;
+}
+
+/* 确保表格内容区域可以滚动 */
+:deep(.el-table__body-wrapper) {
+  overflow-x: auto !important;
+}
+
+/* 确保按钮区域有足够的空间，不被遮挡 */
+.mb8 {
+  margin-bottom: 8px;
+  position: relative;
+  z-index: 1;
+}
+</style>

back-ui/src/views/system/user/index_old.vue → back-ui/src/views/system/user/index_new.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <splitpanes :horizontal="appStore.device === 'mobile'" class="default-theme">
         <!--机构数据-->
-        <pane size="16">
+        <!-- <pane size="16">
           <el-col>
             <div class="head-container">
               <el-input v-model="deptName" placeholder="请输入机构名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
@@ -12,16 +12,16 @@
               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
             </div>
           </el-col>
-        </pane>
+        </pane> -->
         <!--用户数据-->
-        <pane size="84">
+        <pane size="100">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
               <el-form-item label="用户名称" prop="userName">
                 <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item label="用户类型" prop="userType">
-                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+                <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable style="width: 240px">
                   <el-option v-for="dict in user_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
@@ -43,7 +43,7 @@
             </el-form>
 
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
               </el-col>
               <el-col :span="1.5">
@@ -54,7 +54,7 @@
               </el-col>
               <el-col :span="1.5">
                 <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
-              </el-col>
+              </el-col> -->
               <el-col :span="1.5">
                 <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
               </el-col>
@@ -64,15 +64,30 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="省份" align="center" key="location" prop="location" />
+              <el-table-column label="单招年份" align="center" key="endYear" prop="endYear" />
+              <el-table-column label="注册学校" align="center" key="schoolName" prop="schoolName" />
+              <el-table-column label="学校班级" align="center" key="schoolClassName" prop="schoolClassName" />
+              <el-table-column label="培训校区" align="center" key="campusName" prop="campusName" />
+              <el-table-column label="校区班级" align="center" key="campusClassName" prop="campusClassName" />
+              <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column label="卡号" align="center" key="cardNo" prop="cardNo" />
+              <!-- <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" /> -->
               <el-table-column label="用户类型" align="center" key="userType" v-if="columns.status.visible">
                 <template #default="scope">
                   <dict-tag :options="user_type" :value="scope.row.userType" />
                 </template>
               </el-table-column>
-              <el-table-column label="机构" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column label="考生类型" align="center" key="examType" v-if="columns.examType.visible">
+                <template #default="scope">
+                  <dict-tag :options="exam_type" :value="scope.row.examType" />
+                </template>
+              </el-table-column>
+              <el-table-column label="平台机构" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="代理商" align="center" key="deptName" prop="deptName" />
+              <el-table-column label="邀请码" align="center" key="inviteCode" prop="inviteCode" />
+
               <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
                 <template #default="scope">
                   <el-switch
@@ -93,7 +108,7 @@
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                     <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
                   </el-tooltip>
-                  <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                  <!-- <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
                     <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
                   </el-tooltip>
                   <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
@@ -101,11 +116,11 @@
                   </el-tooltip>
                   <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                     <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
-                  </el-tooltip>
+                  </el-tooltip> -->
                 </template>
               </el-table-column>
             </el-table>
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" />
           </el-col>
         </pane>
       </splitpanes>
@@ -226,14 +241,14 @@
 <script setup name="User">
 import { getToken } from "@/utils/auth"
 import useAppStore from '@/store/modules/app'
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
+import { changeUserStatus, listCard, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
 import { Splitpanes, Pane } from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
 
 const router = useRouter()
 const appStore = useAppStore()
 const { proxy } = getCurrentInstance()
-const { sys_normal_disable, sys_user_sex, user_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type")
+const { sys_normal_disable, sys_user_sex, user_type, exam_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type", "exam_type")
 
 const userList = ref([])
 const open = ref(false)
@@ -274,6 +289,7 @@ const columns = ref({
   deptName: { label: '机构', visible: true },
   phonenumber: { label: '手机号码', visible: true },
   status: { label: '状态', visible: true },
+  examType: { label: '考生类型', visible: true },
   createTime: { label: '创建时间', visible: true }
 })
 
@@ -283,6 +299,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
+    userType: undefined,
     phonenumber: undefined,
     status: undefined,
     deptId: undefined
@@ -312,13 +329,25 @@ watch(deptName, val => {
 /** 查询用户列表 */
 function getList() {
   loading.value = true
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+  // 自动添加 userType='01' 参数
+  const params = {
+    ...queryParams.value,
+    userType: '01'
+  }
+  listCard(proxy.addDateRange(params, dateRange.value)).then(res => {
     loading.value = false
     userList.value = res.rows
     total.value = res.total
   })
 }
 
+/** 分页事件处理 */
+function handlePagination(pagination) {
+  queryParams.value.pageNum = pagination.page
+  queryParams.value.pageSize = pagination.limit
+  getList()
+}
+
 /** 查询机构下拉树结构 */
 function getDeptTree() {
   deptTreeSelect().then(response => {
@@ -374,9 +403,12 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/user/export", {
+  // 自动添加 userType='01' 参数
+  const params = {
     ...queryParams.value,
-  },`user_${new Date().getTime()}.xlsx`)
+    userType: '01'
+  }
+  proxy.download("system/user/export", params, `user_${new Date().getTime()}.xlsx`)
 }
 
 /** 用户状态修改  */
@@ -567,3 +599,42 @@ onMounted(() => {
   })
 })
 </script>
+
+<style scoped>
+/* 确保 splitpanes 的 pane 可以滚动 */
+:deep(.splitpanes__pane) {
+  overflow: auto !important;
+  height: 100%;
+}
+
+/* 确保 el-col 内容正常显示，不被遮挡 */
+:deep(.splitpanes__pane .el-col) {
+  padding: 0;
+  overflow: visible;
+}
+
+/* 确保表格容器可以正常显示滚动条 */
+.app-container {
+  height: 100%;
+}
+
+.app-container .el-row {
+  height: 100%;
+}
+
+.app-container .el-table {
+  width: 100%;
+}
+
+/* 确保表格内容区域可以滚动 */
+:deep(.el-table__body-wrapper) {
+  overflow-x: auto !important;
+}
+
+/* 确保按钮区域有足够的空间，不被遮挡 */
+.mb8 {
+  margin-bottom: 8px;
+  position: relative;
+  z-index: 1;
+}
+</style>

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -74,10 +74,18 @@ public class SysUserController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {
-        // 设置用户类型过滤条件：user_type=1 (Card类型，值为"01")
-        if (StringUtils.isEmpty(user.getUserType())) {
-            user.setUserType("01");
-        }
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/listCard")
+    public TableDataInfo listCard(SysUser user)
+    {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         // 先获取分页信息，再处理数据
@@ -140,6 +148,10 @@ public class SysUserController extends BaseController
 
             // 遍历用户列表，设置学校名称和班级名称
             for (SysUser user : list) {
+                // 设置代理商名称（从dept对象中获取）
+                if (user.getDept() != null && user.getDept().getDeptName() != null) {
+                    user.setDeptName(user.getDept().getDeptName());
+                }
                 if (user.getCardId() != null) {
                     DzCards card = cardMap.get(user.getCardId());
                     if (card != null) {
@@ -359,4 +371,14 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 获取省份列表（去重）
+     */
+    @GetMapping("/locations")
+    public AjaxResult getLocations()
+    {
+        List<String> locations = userService.selectDistinctLocations();
+        return success(locations);
+    }
 }

ie-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.Type;
 
 /**
  * Entity基类
@@ -26,6 +28,7 @@ public class BaseEntity implements Serializable
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 15, type = Type.EXPORT)
     private Date createTime;
 
     /** 更新者 */

ie-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -28,36 +28,36 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
+//    @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    @Excel(name = "用户类型", cellType = ColumnType.TEXT, prompt = "用户类型")
+    @Excel(name = "用户类型", cellType = ColumnType.TEXT, dictType = "user_type", sort = 10, type = Type.EXPORT)
     private String userType;
 
     private Long userTypeId;
 
     /** 机构ID */
-    @Excel(name = "机构编号", type = Type.IMPORT)
+//    @Excel(name = "机构编号", type = Type.IMPORT)
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+//    @Excel(name = "登录名称")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "姓名", sort = 7, type = Type.EXPORT)
     private String nickName;
 
     /** 用户邮箱 */
-    @Excel(name = "用户邮箱")
+//    @Excel(name = "用户邮箱")
     private String email;
 
     /** 手机号码 */
-    @Excel(name = "手机号码", cellType = ColumnType.TEXT)
+    @Excel(name = "手机号", cellType = ColumnType.TEXT, sort = 8, type = Type.EXPORT)
     private String phonenumber;
 
     /** 用户性别 */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+//    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
     /** 用户头像 */
@@ -71,28 +71,28 @@ public class SysUser extends BaseEntity
     private String password2;
 
     /** 账号状态（0正常 1停用） */
-    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
+//    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
     /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
+//    @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
     /** 最后登录时间 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+//    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /** 密码最后更新时间 */
     private Date pwdUpdateDate;
 
     /** 机构对象 */
-    @Excels({
-        @Excel(name = "机构名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "机构负责人", targetAttr = "leader", type = Type.EXPORT)
-    })
+//    @Excels({
+//        @Excel(name = "平台机构", targetAttr = "deptName", sort = 12, type = Type.EXPORT),
+//        @Excel(name = "机构负责人", targetAttr = "leader", type = Type.EXPORT)
+//    })
     private SysDept dept;
 
     /** 角色对象 */
@@ -108,9 +108,11 @@ public class SysUser extends BaseEntity
     private Long roleId;
 
     /** 省份 **/
+    @Excel(name = "省份", sort = 1, type = Type.EXPORT)
     private String location;
 
     /** 考生类型 **/
+    @Excel(name = "考生类型", dictType = "exam_type", sort = 11, type = Type.EXPORT)
     private ExamType examType;
 
     /**
@@ -121,9 +123,11 @@ public class SysUser extends BaseEntity
     /**
      * 毕业年份
      */
+    @Excel(name = "单招年份", sort = 2, type = Type.EXPORT)
     private Integer endYear;
 
     /** 邀请码 **/
+    @Excel(name = "邀请码", sort = 14, type = Type.EXPORT)
     private String inviteCode;
 
     /** 考试成绩  {} **/
@@ -141,17 +145,26 @@ public class SysUser extends BaseEntity
     private Long cardId;
 
     /** 卡号 */
+    @Excel(name = "卡号", sort = 9, type = Type.EXPORT)
     private String cardNo;
 
     /** 注册学校名称 */
+    @Excel(name = "注册学校", sort = 3, type = Type.EXPORT)
     private String schoolName;
     /** 学校班级名称 */
+    @Excel(name = "学校班级", sort = 4, type = Type.EXPORT)
     private String schoolClassName;
     /** 培训校区名称 */
+    @Excel(name = "培训校区", sort = 5, type = Type.EXPORT)
     private String campusName;
     /** 校区班级名称 */
+    @Excel(name = "校区班级", sort = 6, type = Type.EXPORT)
     private String campusClassName;
 
+    /** 代理商名称 */
+    @Excel(name = "代理商", sort = 13, type = Type.EXPORT)
+    private String deptName;
+
     /** 校区id */
     @ApiModelProperty(name = "学校id")
     private Long schoolId;
@@ -538,6 +551,14 @@ public class SysUser extends BaseEntity
         this.campusClassName = campusClassName;
     }
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public String getEvalCounts() {
         return evalCounts;
     }

ie-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -158,4 +158,11 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    /**
+     * 查询所有非空的省份列表（去重）
+     *
+     * @return 省份列表
+     */
+    public List<String> selectDistinctLocations();
 }

ie-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -228,4 +228,11 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName);
+
+    /**
+     * 查询所有非空的省份列表（去重）
+     *
+     * @return 省份列表
+     */
+    public List<String> selectDistinctLocations();
 }

ie-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -635,4 +635,15 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return cond.size() == 0 ? Lists.newArrayList() : userMapper.selectUsers(cond);
     }
+
+    /**
+     * 查询所有非空的省份列表（去重）
+     *
+     * @return 省份列表
+     */
+    @Override
+    public List<String> selectDistinctLocations()
+    {
+        return userMapper.selectDistinctLocations();
+    }
 }

ie-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -101,6 +101,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userType != null and userType != ''">
 			AND u.user_type = #{userType}
 		</if>
+		<if test="location != null and location != ''">
+			AND u.location like concat('%', #{location}, '%')
+		</if>
+		<if test="endYear != null">
+			AND u.end_year = #{endYear}
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
+		<if test="examType != null">
+			AND u.exam_type = #{examType}
+		</if>
+		<if test="deptName != null and deptName != ''">
+			AND d.dept_name like concat('%', #{deptName}, '%')
+		</if>
+		<if test="inviteCode != null and inviteCode != ''">
+			AND u.invite_code like concat('%', #{inviteCode}, '%')
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
@@ -315,4 +333,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
  	</delete>
 
+	<!-- 查询所有非空的省份列表（去重） -->
+	<select id="selectDistinctLocations" resultType="String">
+		SELECT DISTINCT location
+		FROM sys_user
+		WHERE location IS NOT NULL AND location != '' AND del_flag = '0'
+		ORDER BY location
+	</select>
+
 </mapper>