#

luxiaotao1123

2024-02-23 3e56ecdfa4ba14eaeac61b6efe75bb9ae0eaadff

#

 zy-asrs-flow/src/pages/system/operationRecord/components/edit.jsx

@@ -142,7 +142,7 @@
                            debounceTime={300}
                            request={async ({ keyWords }) => {
                                const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
                            return resp.data;
                                return resp.data;
                            }}
                        />
                        <ProFormDateTimePicker

 zy-asrs-flow/src/pages/system/user/components/edit.jsx

@@ -151,16 +151,6 @@
                        />
                    </ProForm.Group>
                    <ProForm.Group>
                        {/* <ProFormSelect
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
                            ]}
                        /> */}
                        <ProFormRadio.Group
                            name="status"
                            label="状态"
@@ -177,7 +167,11 @@
                            label="角色"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, message: '角色不能为空!' }]}
                            rules={[{ required: true, type: 'array', message: '角色不能为空!' }]}
                            request={async ({ keyWords }) => {
                                const resp = await Http.doPostForm('api/role/query', { condition: keyWords });
                                return resp.data;
                            }}
                        />
                    </ProForm.Group>
                    <ProFormTextArea

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java

@@ -953,7 +953,7 @@
                        .append("                            debounceTime={300}\n")
                        .append("                            request={async ({ keyWords }) => {\n")
                        .append("                                const resp = await Http.doPostForm('api/").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("/query', { condition: keyWords });\n")
                        .append("                            return resp.data;\n")
                        .append("                                return resp.data;\n")
                        .append("                            }}\n");
            }


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java

@@ -64,6 +64,7 @@
    @PreAuthorize("hasAuthority('system:user:save')")
    @OperationLog("添加用户")
    @PostMapping("/user/save")
    @Transactional
    public R save(@RequestBody User user) {
        if (!Cools.isEmpty(user.getUsername())
                && userService.count(new LambdaQueryWrapper<User>().eq(User::getUsername, user.getUsername())) > 0) {
@@ -86,14 +87,23 @@
        user.setUpdateTime(new Date());

        if (!userService.save(user)) {
            return R.error("添加失败");
            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("添加成功");
    }

    @PreAuthorize("hasAuthority('system:user:update')")
    @OperationLog("修改用户")
    @PostMapping("/user/update")
    @Transactional
    public R update(@RequestBody User user) {
        if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>()
                .eq(User::getUsername, user.getUsername())
@@ -119,8 +129,16 @@
        user.setUpdateTime(new Date());

        if (!userService.updateById(user)) {
            return R.error("修改失败");
            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("修改成功");
    }


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java

@@ -1,10 +1,12 @@
package com.zy.asrs.wcs.system.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.system.service.DeptService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserRoleService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -165,6 +167,9 @@
    private String memo;

    @TableField(exist = false)
    private Long[] roleIds;

    @TableField(exist = false)
    private List<Role> roles;

    @TableField(exist = false)
@@ -322,6 +327,16 @@
        return null;
    }

    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;
        }
    }

    @Override
    public boolean isAccountNonExpired() {
        return true;