From d8cec13af70c651085e95601229d40aba38186a8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 七月 2024 15:42:38 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/system/user/edit.vue | 182 +++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java | 12
zy-asrs-wms/src/main/java/user.sql | 9
zy-asrs-admin/src/views/system/user/index.vue | 454 +++++++++++++++++++++++++++++++++++++
zy-asrs-admin/src/views/login/LoginView.vue | 1
6 files changed, 654 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-admin/src/views/login/LoginView.vue b/zy-asrs-admin/src/views/login/LoginView.vue
index bf0dcce..38556fe 100644
--- a/zy-asrs-admin/src/views/login/LoginView.vue
+++ b/zy-asrs-admin/src/views/login/LoginView.vue
@@ -29,6 +29,7 @@
localStorage.setItem('token', data.accessToken)
localStorage.setItem('user', JSON.stringify(data.user))
message.success('鐧诲綍鎴愬姛')
+ window.location.reload();
} else {
message.error(result.data.msg)
}
diff --git a/zy-asrs-admin/src/views/system/user/edit.vue b/zy-asrs-admin/src/views/system/user/edit.vue
new file mode 100644
index 0000000..d907a4f
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/user/edit.vue
@@ -0,0 +1,182 @@
+<script setup>
+import { ref, nextTick } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+
+const emit = defineEmits(['tableReload'])
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+ post(isSave.value ? '/api/user/save' : '/api/user/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const DeptQueryList = ref(null);
+DeptQuery();
+function DeptQuery() {
+ postForm('/api/dept/query', {}).then(resp => {
+ let result = resp.data;
+ DeptQueryList.value = result.data;
+ })
+}
+const UserQueryList = ref(null);
+UserQuery();
+function UserQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ UserQueryList.value = result.data;
+ })
+}
+
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ isSave,
+})
+
+</script>
+
+<script>
+export default {
+ name: '鐢ㄦ埛绠＄悊-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 600px;">
+ <a-form :model="formData" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
+ @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.sys_user.username', '璐﹀彿')" name="username" style="width: 250px;"
+ :rules="[{ required: true }]">
+ <a-input v-model:value="formData.username" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.nickname', '鏄电О')" name="nickname"
+ style="width: 250px;">
+ <a-input v-model:value="formData.nickname" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.avatar', '澶村儚')" name="avatar" style="width: 250px;">
+ <a-input v-model:value="formData.avatar" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.code', '宸ュ彿')" name="code" style="width: 250px;">
+ <a-input v-model:value="formData.code" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.sex', '鎬у埆')" name="sex" style="width: 250px;">
+ <a-select v-model:value="formData.sex" :options="[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.phone', '鎵嬫満鍙�')" name="phone" style="width: 250px;">
+ <a-input v-model:value="formData.phone" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.email', '閭')" name="email" style="width: 250px;">
+ <a-input v-model:value="formData.email" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.email_verified', '閭楠岃瘉')" name="emailVerified"
+ style="width: 250px;">
+ <a-select v-model:value="formData.emailVerified" :options="[
+ { label: '鍚�', value: 0 },
+ { label: '鏄�', value: 1 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.dept_id', '鎵�灞為儴闂�')" name="deptId" style="width: 250px;">
+ <a-select v-model:value="formData.deptId" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="DeptQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.real_name', '鐪熷疄濮撳悕')" name="realName"
+ style="width: 250px;">
+ <a-input v-model:value="formData.realName" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.id_card', '韬唤璇佸彿')" name="idCard" style="width: 250px;">
+ <a-input v-model:value="formData.idCard" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.birthday', '鍑虹敓鏃ユ湡')" name="birthday"
+ style="width: 250px;">
+ <a-input v-model:value="formData.birthday" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.introduction', '涓汉绠�浠�')" name="introduction"
+ style="width: 250px;">
+ <a-input v-model:value="formData.introduction" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.status', '鐘舵��')" name="status" style="width: 250px;">
+ <a-select v-model:value="formData.status" :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.create_by', '娣诲姞浜哄憳')" name="createBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="UserQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.update_time', '淇敼鏃堕棿')" name="updateTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.update_by', '淇敼浜哄憳')" name="updateBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="UserQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.sys_user.memo', '澶囨敞')" name="memo" style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/system/user/index.vue b/zy-asrs-admin/src/views/system/user/index.vue
new file mode 100644
index 0000000..3ec7600
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/user/index.vue
@@ -0,0 +1,454 @@
+<script setup>
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+import {
+ DownOutlined,
+} from "@ant-design/icons-vue";
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-user';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let currentDept = ref(null);
+let tableData = ref([]);
+getPage();
+
+const columns = [
+ {
+ title: formatMessage('db.sys_user.username', '璐﹀彿'),
+ dataIndex: 'username',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_user.nickname', '鏄电О'),
+ dataIndex: 'nickname',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.sys_user.avatar', '澶村儚'),
+ // dataIndex: 'avatar',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.code', '宸ュ彿'),
+ // dataIndex: 'code',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.sys_user.sex', '鎬у埆'),
+ dataIndex: 'sex$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_user.phone', '鎵嬫満鍙�'),
+ dataIndex: 'phone',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.sys_user.email', '閭'),
+ // dataIndex: 'email',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.email_verified', '閭楠岃瘉'),
+ // dataIndex: 'emailVerified$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.sys_user.dept_id', '閮ㄩ棬'),
+ dataIndex: 'deptId$',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.sys_user.real_name', '鐪熷疄濮撳悕'),
+ // dataIndex: 'realName',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.id_card', '韬唤璇佸彿'),
+ // dataIndex: 'idCard',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.birthday', '鍑虹敓鏃ユ湡'),
+ // dataIndex: 'birthday',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.introduction', '涓汉绠�浠�'),
+ // dataIndex: 'introduction',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.sys_user.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.sys_user.create_time', '娣诲姞鏃堕棿'),
+ // dataIndex: 'createTime$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.create_by', '娣诲姞浜哄憳'),
+ // dataIndex: 'createBy$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.update_time', '淇敼鏃堕棿'),
+ // dataIndex: 'updateTime$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.update_by', '淇敼浜哄憳'),
+ // dataIndex: 'updateBy$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_user.memo', '澶囨敞'),
+ // dataIndex: 'memo',
+ // width: 140,
+ // ellipsis: true,
+ // },
+
+ {
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 240,
+ },
+];
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ post('/api/user/page1', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value,
+ deptId: currentDept?.value?.id,
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleEdit = (item) => {
+ editChild.value.open = true;
+ editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+ editChild.value.isSave = item == null;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/user/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/user/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+let openResetPass = ref(false);
+let currentResetPass = ref(null);
+let newPassword = ref("");
+const handleResetPass = (item) => {
+ openResetPass.value = true;
+ currentResetPass.value = item;
+}
+
+const handleResetPassSubmit = (e) => {
+ if (newPassword.value == '') {
+ message.warning(formatMessage('login.rule.password', '璇疯緭鍏ュ瘑鐮�'))
+ return;
+ }
+
+ post('/api/user/reset/pwd', {
+ id: currentResetPass.value.id,
+ password: newPassword.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ message.success(result.msg);
+ openResetPass.value = false;
+ currentResetPass.value = null;
+ newPassword.value = "";
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+let openAssignRole = ref(false);
+let currentAssignRole = ref(null);
+let assignRoleData = ref([]);
+let currentCheckRole = ref([]);
+const handleAssignRole = (item) => {
+ openAssignRole.value = true;
+ currentAssignRole.value = item;
+ currentCheckRole.value = item.userRoleIds;
+}
+
+const handleAssignRoleSubmit = (e) => {
+ post('/api/user/update', {
+ id: currentAssignRole.value.id,
+ roleIds: currentCheckRole.value,
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ message.success(result.msg);
+ openAssignRole.value = false;
+ currentAssignRole.value = null;
+ currentCheckRole.value = [];
+ getPage()
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+getAssignRoleData();
+function getAssignRoleData() {
+ post('/api/role/query', {}).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ assignRoleData.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+let deptExpandedKeys = ref([]);
+let deptData = ref([]);
+let searchDept = ref("");
+getDeptData()
+function getDeptData() {
+ post('/api/dept/tree', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchDept.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ deptData.value = [{
+ id: null,
+ name: '鍏ㄩ儴',
+ children: data
+ }]
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+
+ deptExpandedKeys.value = ['0-0']
+ })
+}
+
+const handleDeptSelected = (selectedKeys, e) => {
+ currentDept.value = {
+ id: e.node.id,
+ name: e.node.name,
+ };
+ getPage()
+}
+
+const handleSearchDept = (e) => {
+ getDeptData()
+}
+
+</script>
+
+<script>
+export default {
+ name: '鐢ㄦ埛绠＄悊'
+}
+</script>
+
+<template>
+ <div style="display: flex;">
+ <a-card :title="formatMessage('common.dept', '閮ㄩ棬')" style="flex: 3;margin-right: 30px;">
+ <a-input v-model:value="searchDept" @change="handleSearchDept" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="margin-bottom: 8px" />
+ <a-tree v-model:expandedKeys="deptExpandedKeys" @select="handleDeptSelected" :tree-data="deptData" blockNode>
+ <template #title="{ name }">
+ <span>{{ name }}</span>
+ </template>
+ </a-tree>
+ </a-card>
+
+ <a-card style="flex: 10;">
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
+ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'oper'">
+ <div style="display: flex;justify-content: space-evenly;">
+ <a-button type="link" primary> <a-dropdown>
+ <a class="ant-dropdown-link" @click.prevent>
+ {{ formatMessage('common.operation', '鎿嶄綔') }}
+ <DownOutlined />
+ </a>
+ <template #overlay>
+ <a-menu>
+ <a-menu-item>
+ <a-button type="link" primary @click="handleResetPass(record)">
+ {{ formatMessage('page.reset.pwd', '閲嶇疆瀵嗙爜') }}
+ </a-button>
+ </a-menu-item>
+ <a-menu-item>
+ <a-button type="link" primary @click="handleAssignRole(record)">
+ {{ formatMessage('page.assign.role', '鍒嗛厤瑙掕壊') }}
+ </a-button>
+ </a-menu-item>
+ </a-menu>
+ </template>
+ </a-dropdown>
+ </a-button>
+ <a-button type="link" primary @click="handleEdit(record)">
+ {{ formatMessage('page.edit', '缂栬緫') }}
+ </a-button>
+ <a-button type="link" danger @click="handleDel([record])">
+ {{ formatMessage('page.delete', '鍒犻櫎') }}
+ </a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+ </a-card>
+
+ <a-modal v-model:open="openResetPass" :title="formatMessage('page.reset.pwd', '閲嶇疆瀵嗙爜')" @ok="handleResetPassSubmit">
+ <a-form style="display: flex;justify-content: center;flex-wrap: wrap;" autocomplete="off">
+ <a-form-item :label="formatMessage('personal.security.new.pwd', '鏂板瘑鐮�')">
+ <a-input v-model:value="newPassword" />
+ </a-form-item>
+ </a-form>
+ </a-modal>
+
+ <a-modal v-model:open="openAssignRole" :title="formatMessage('page.assign.role', '鍒嗛厤瑙掕壊')"
+ @ok="handleAssignRoleSubmit">
+ <a-form style="display: flex;justify-content: center;flex-wrap: wrap;" autocomplete="off">
+ <a-form-item :label="formatMessage('page.assign.role', '瑙掕壊')">
+ <a-select v-model:value="currentCheckRole" :options="assignRoleData" mode="multiple" style="width: 380px;">
+ </a-select>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
index 17f5f8f..3ab59ae 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
@@ -94,12 +94,12 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
- userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
- for (Long roleId : user.getRoleIds()) {
- if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- }
- }
+// userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
+// for (Long roleId : user.getRoleIds()) {
+// if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+// }
+// }
return R.ok("娣诲姞鎴愬姛");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index 47ab7ed..f956da6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_operation_record";
- generator.tableName="鎿嶄綔鏃ュ織";
+ generator.table="sys_user";
+ generator.tableName="鐢ㄦ埛绠＄悊";
generator.packagePath="com.zy.asrs.wms.system";
generator.build();
diff --git a/zy-asrs-wms/src/main/java/user.sql b/zy-asrs-wms/src/main/java/user.sql
new file mode 100644
index 0000000..a704325
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/user.sql
@@ -0,0 +1,9 @@
+-- save user record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '鐢ㄦ埛绠＄悊绠＄悊', '0', '/system/user', '/system/user', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ鐢ㄦ埛绠＄悊', '', '1', 'system:user:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞鐢ㄦ埛绠＄悊', '', '1', 'system:user:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼鐢ㄦ埛绠＄悊', '', '1', 'system:user:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎鐢ㄦ埛绠＄悊', '', '1', 'system:user:remove', '3', '1', '1');
+
--
Gitblit v1.9.1