From f543faa7b485a9f752d5e6b2236d630682690cd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 09:14:53 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/components/edit.jsx | 3 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 10 +++--
zy-asrs-flow/src/pages/account/setting/components/base.jsx | 43 +++++++++------------
zy-asrs-flow/src/pages/system/user/index.jsx | 15 -------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java | 14 +++---
zy-asrs-flow/src/pages/system/user/components/assignRole.jsx | 3 +
6 files changed, 35 insertions(+), 53 deletions(-)
diff --git a/zy-asrs-flow/src/pages/account/setting/components/base.jsx b/zy-asrs-flow/src/pages/account/setting/components/base.jsx
index f7e3925..54b9c80 100644
--- a/zy-asrs-flow/src/pages/account/setting/components/base.jsx
+++ b/zy-asrs-flow/src/pages/account/setting/components/base.jsx
@@ -2,9 +2,10 @@
ProForm,
ProFormText,
ProFormTextArea,
- ProFormSelect
+ ProFormSelect,
+ ProFormDigit
} from '@ant-design/pro-components';
-import { Button, Input, message, Upload } from 'antd';
+import { Button, Input, message, Upload, Form } from 'antd';
import React from 'react';
import useStyles from './index.style';
import Http from '@/utils/http';
@@ -34,6 +35,7 @@
const { styles } = useStyles();
const [loading, setLoading] = React.useState(false);
const [currentUser, setCurrentUser] = React.useState({});
+ const [form] = Form.useForm();
const AvatarView = ({ avatar }) => (
<>
@@ -72,14 +74,13 @@
if (currentUser.avatar) {
return currentUser.avatar;
}
- const url = { defaultAvat };
- return url;
}
return defaultAvat;
};
- const handleFinish = async () => {
- handleUpdate();
+ const handleFinish = async (values) => {
+ // console.log(values); return
+ handleUpdate(values);
};
return (
@@ -88,6 +89,7 @@
<>
<div className={styles.left}>
<ProForm
+ form={form}
layout="vertical"
onFinish={handleFinish}
submitter={{
@@ -98,10 +100,14 @@
}}
initialValues={{
...currentUser,
- // phone: currentUser?.phone.split('-'),
}}
hideRequiredMark
>
+ <ProFormDigit
+ name="id"
+ disabled
+ hidden={true}
+ />
<ProFormText
width="md"
name="username"
@@ -130,7 +136,6 @@
name="sex"
label="鎬у埆"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
options={[
{ label: '鏈煡', value: 0 },
{ label: '鐢�', value: 1 },
@@ -143,7 +148,7 @@
label="鎵嬫満鍙�"
rules={[
{
- required: true,
+ required: false,
message: '璇疯緭鍏ユ偍鐨勬墜鏈哄彿!',
},
]}
@@ -154,7 +159,7 @@
label="閭"
rules={[
{
- required: true,
+ required: false,
message: '璇疯緭鍏ユ偍鐨勯偖绠�!',
},
]}
@@ -165,18 +170,7 @@
label="鐪熷疄濮撳悕"
rules={[
{
- required: true,
- message: '璇疯緭鍏ユ偍鐨勭湡瀹炲鍚�!',
- },
- ]}
- />
- <ProFormText
- width="md"
- name="realName"
- label="鐪熷疄濮撳悕"
- rules={[
- {
- required: true,
+ required: false,
message: '璇疯緭鍏ユ偍鐨勭湡瀹炲鍚�!',
},
]}
@@ -187,7 +181,7 @@
label="韬唤璇佸彿"
rules={[
{
- required: true,
+ required: false,
message: '璇疯緭鍏ユ偍鐨勮韩浠借瘉鍙�!',
},
]}
@@ -197,11 +191,10 @@
label="涓汉绠�浠�"
rules={[
{
- required: true,
+ required: false,
message: '璇疯緭鍏ヤ釜浜虹畝浠�!',
},
]}
- placeholder="涓汉绠�浠�"
/>
</ProForm>
</div>
diff --git a/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx b/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
index 6f2d08a..6f0433c 100644
--- a/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
@@ -14,7 +14,8 @@
useEffect(() => {
form.resetFields();
form.setFieldsValue({
- ...props.values
+ ...props.values,
+ roleIds: props.values.userRoleIds
})
}, [form, props])
diff --git a/zy-asrs-flow/src/pages/system/user/components/edit.jsx b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
index 906512d..3bca79a 100644
--- a/zy-asrs-flow/src/pages/system/user/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
@@ -19,7 +19,8 @@
useEffect(() => {
form.resetFields();
form.setFieldsValue({
- ...props.values
+ ...props.values,
+ roleIds: props.values.userRoleIds
})
}, [form, props])
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index f6ada67..5c0d290 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -308,21 +308,6 @@
]}
/>,
},
- // {
- // title: '瑙掕壊',
- // valueType: 'text',
- // hidden: false,
- // width: 100,
- // render: (_, record) => {
- // if (record.roleIds && record.roleIds.length > 0) {
- // Http.doGetPromise('api/role/list/name/' + record.roleIds.join(','), null, (res) => {
- // return '-'
- // });
- // } else {
- // return '-'
- // }
- // },
- // },
{
title: '鐪熷疄濮撳悕',
dataIndex: 'realName',
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index da19514..83f6c38 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -135,10 +135,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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
index 01d500b..648abb0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
@@ -328,13 +328,13 @@
}
public Long[] getRoleIds() {
- if (Cools.isEmpty((Object) this.roleIds)) {
- UserRoleService service = SpringUtils.getBean(UserRoleService.class);
- List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
- return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
- } else {
- return this.roleIds;
- }
+ return this.roleIds;
+ }
+
+ public Long[] getUserRoleIds() {
+ UserRoleService service = SpringUtils.getBean(UserRoleService.class);
+ List<UserRole> list = service.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, this.id));
+ return list.stream().map(UserRole::getRoleId).toArray(Long[]::new);
}
@Override
--
Gitblit v1.9.1