#
luxiaotao1123
2024-02-15 c983d4642b2aeeceb6442badaebd1b7bab7943eb
#
2个文件已修改
18 ■■■■■ 已修改文件
zy-asrs-flow/src/pages/system/role/index.jsx 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/system/role/index.jsx
@@ -112,6 +112,7 @@
            dataIndex: 'name',
            valueType: 'text',
            copyable: true,
            filterDropdown: (props) => <Filter name='name' {...props} actionRef={actionRef} setSearchParam={setSearchParam} />,
        },
        {
            title: '标识',
@@ -120,6 +121,21 @@
            filterDropdown: (props) => <Filter name='code' {...props} actionRef={actionRef} setSearchParam={setSearchParam} />,
        },
        {
            title: '公司',
            dataIndex: 'hostId$',
            valueType: 'text',
        },
        {
            title: '状态',
            dataIndex: 'status$',
            valueType: 'text',
        },
        {
            title: '修改时间',
            dataIndex: 'updateTime$',
            valueType: 'text',
        },
        {
            title: '操作',
            dataIndex: 'option',
            width: '220px',
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
@@ -107,7 +107,7 @@
        HostService service = SpringUtils.getBean(HostService.class);
        Host host = service.getById(this.hostId);
        if (!Cools.isEmpty(host)){
            return String.valueOf(host.getId());
            return String.valueOf(host.getName());
        }
        return null;
    }