#

luxiaotao1123

2024-09-09 f576d7b337994a83c57f086b3de89779ba03e664

#

 zy-acs-flow/src/i18n/core/chineseMessages.js

@@ -110,7 +110,7 @@
                "Some of your changes weren't saved. Are you sure you want to ignore them?",
        },
        navigation: {
            no_results: 'No results found',
            no_results: '数据为空',
            no_more_results:
                'The page number %{page} is out of boundaries. Try the previous page.',
            page_out_of_boundaries: 'Page number %{page} out of boundaries',

 zy-acs-flow/src/page/user/UserList.jsx

@@ -71,7 +71,6 @@
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="username" label="table.field.user.username" />,
    <TextInput source="password" label="table.field.user.password" />,
    <TextInput source="nickname" label="table.field.user.nickname" />,
    <TextInput source="code" label="table.field.user.code" />,
    <SelectInput source="sex" label="table.field.user.sex"
@@ -83,19 +82,11 @@
    />,
    <TextInput source="phone" label="table.field.user.phone" />,
    <TextInput source="email" label="table.field.user.email" />,
    <SelectInput source="emailVerified" label="table.field.user.emailVerified"
        choices={[
            { id: 0, name: '否' },
            { id: 1, name: '是' },
        ]}
    />,
    <ReferenceInput source="deptId" reference="dept">
        <AutocompleteInput label="table.field.user.deptId" optionText="name" />
    </ReferenceInput>,
    <TextInput source="realName" label="table.field.user.realName" />,
    <TextInput source="idCard" label="table.field.user.idCard" />,
    <TextInput source="birthday" label="table.field.user.birthday" />,
    <TextInput source="introduction" label="table.field.user.introduction" />,

    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput

 zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml

@@ -18,19 +18,35 @@
        su.*
        from sys_user su
        left join sys_dept sd on su.dept_id = sd.id
        left join sys_user_role sur on sur.user_id = su.id
        where 1=1
        and su.deleted = 0

        <if test="param.deptId != null">
            and (FIND_IN_SET(#{param.deptId}, sd.`path`) OR sd.`id` = #{param.deptId})
        </if>

        <if test="param.roleIds != null and param.roleIds.size > 0">
            and sur.role_id in
            <foreach collection="param.roleIds" item="item" index="idx"  separator="," open="(" close=")">
                #{item}
            </foreach>
        </if>

        <if test="param.username != null">
            and su.username like concat('%',#{param.username},'%')
        </if>
        <if test="param.nickname != null">
            and su.nickname like concat('%',#{param.nickname},'%')
        </if>
        <if test="param.code != null">
            and su.code like concat('%',#{param.code},'%')
        </if>
        <if test="param.phone != null">
            and su.phone like concat('%',#{param.phone},'%')
        </if>
        <if test="param.email != null">
            and su.email like concat('%',#{param.email},'%')
        </if>
        <if test="param.sex != null">
            and su.sex = #{param.sex}
@@ -38,6 +54,15 @@
        <if test="param.status != null">
            and su.status = #{param.status}
        </if>
        <if test="param.realName != null">
            and su.real_name like concat('%',#{param.realName},'%')
        </if>
        <if test="param.idCard != null">
            and su.id_card like concat('%',#{param.idCard},'%')
        </if>
        <if test="param.memo != null">
            and su.memo = like concat('%',#{param.memo},'%')
        </if>
        <if test="param.condition != null">
            and (
                   su.username like concat('%',#{param.condition},'%')