#

luxiaotao1123

2024-02-28 f543faa7b485a9f752d5e6b2236d630682690cd4

#

 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>

 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])


 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])


 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',

 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("服务器内部错误");
                }
            }
        }


 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