代码提交 bug解决

无关风月

2024-08-01 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -19,15 +19,13 @@
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.validate.InsertGroup;
import com.ruoyi.system.api.validate.UpdateGroup;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.ResetPwdDTO;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.dto.SysUserDTO;
import com.ruoyi.system.domain.dto.SysUserQuery;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
@@ -102,7 +100,7 @@
    public AjaxResult list(@Validated @RequestBody SysUserQuery query) {
        PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
        PageInfo<SysUser> page = userService.getList(pageInfo, query.getNickName(),
                query.getPhonenumber(), query.getStatus());
                query.getPhonenumber(), query.getStatus(),query.getDeptId());
        return AjaxResult.success(page);
    }

@@ -116,7 +114,7 @@
    public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        user.setUserId(null);
        user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
        user.setUserType("01");
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
@@ -125,9 +123,16 @@
            return error("手机号已开通账号");
        }
        user.setCreateBy(SecurityUtils.getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        user.setPassword(SecurityUtils.encryptPassword("a123456"));
        user.setRoleType(1);
        int i = userService.insertUser(user);
        user.setDept(deptService.selectDeptById(dto.getDeptId()));
        SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
        user.setDeptName(sysDept.getDeptName());
        user.setDeptId(dto.getDeptId());
        SysRole byId = roleService.selectRoleById(dto.getRoleId());
        user.setRoleName(byId.getRoleName());
        user.setRoleId(dto.getRoleId());
        userService.save(user);
        SysUserRole sysUserRole = new SysUserRole();
        sysUserRole.setRoleId(dto.getRoleId());
        sysUserRole.setUserId(user.getUserId());
@@ -147,14 +152,15 @@
        AjaxResult ajax = AjaxResult.success();
        List<SysRole> roles = roleService.selectRoleAll();
        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        ajax.put("posts", postService.selectPostAll());
        ajax.put("Dept", deptService.selectDeptList(null));
        if (StringUtils.isNotNull(userId)) {
            SysUser sysUser = userService.selectUserById(userId);
            SysUser sysUser = userService.getById(userId);
            ajax.put(AjaxResult.DATA_TAG, sysUser);
            ajax.put("postIds", postService.selectPostListByUserId(userId));
            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
            ajax.put("Dept", sysUser.getDept());
            ajax.put("roleId", sysUser.getRoleId());
            ajax.put("roleName", sysUser.getRoleName());
        }
        return AjaxResult.success(ajax);
        return ajax;
    }


@@ -198,7 +204,14 @@
        user.setPassword(null);
        user.setUpdateBy(SecurityUtils.getUsername());
        user.setUpdateTime(new Date());
        return toAjax(userService.updateUser(user));
        user.setDept(deptService.selectDeptById(dto.getDeptId()));
        SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
        user.setDeptName(sysDept.getDeptName());
        user.setDeptId(dto.getDeptId());
        SysRole byId = roleService.selectRoleById(dto.getRoleId());
        user.setRoleName(byId.getRoleName());
        user.setRoleId(dto.getRoleId());
        return toAjax(userService.updateById(user));
    }


@@ -260,6 +273,18 @@
        }
    }

    @PostMapping("/getUserSupplierList")
    public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
        LambdaQueryWrapper<SysUser> like1 = new LambdaQueryWrapper<SysUser>();
        if (getVolumeProductionRkQuery.getSupplierName()!=null){
            like1.like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName());
        }if (getVolumeProductionRkQuery.getSupplierPhone()!=null){
            like1.like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone());
        }
        List<SysUser> list = userService.list(like1);
        return R.ok(list);
    }

    @PostMapping("/updateSysUser")
    public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
        try {
@@ -272,6 +297,7 @@
            return R.ok();
        }
    }


    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
    @RequiresPermissions("system:user:export")
@@ -374,7 +400,7 @@
    @PostMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
        SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
                .in(SysUser::getUserType, "00", "01").one();
                .in(SysUser::getUserType, "00", "01", "02", "03").one();
        if (StringUtils.isNull(user)) {
            throw new ServiceException("账号不存在");
        }
@@ -546,6 +572,13 @@
        return R.ok(userService.getSupplierPage(query));
    }


    @ApiOperation(value = "获取供应商不分页列表", notes = "获取供应商不分页列表")
    @PostMapping("/supplier-page1")
    public R<List<SysUser>> getSupplierPage1() {
        return R.ok(userService.getSupplierPage1());
    }

    /**
     * 添加/编辑供应商
     *
@@ -571,6 +604,43 @@
        return R.ok();
    }


    @ApiOperation(value = "获取仓库管理员分页列表", notes = "获取仓库管理分页列表")
    @PostMapping("/conservator-page")
    public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
        return R.ok(userService.getConservatorPage(query));
    }

    @ApiOperation(value = "获取仓库管理员不分页列表", notes = "获取仓库管理分页列表")
    @PostMapping("/conservator-page1")
    public R<List<SysUser>> getConservatorPage1() {
        return R.ok(userService.getConservatorPage1());
    }

    /**
     * 添加/编辑供应商
     *
     * @param dto 供应商数据传输对象
     */
    @ApiOperation(value = "添加/编辑仓库管理", notes = "添加/编辑仓库管理")
    @PostMapping("/save-conservator")
    public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
        userService.saveConservator(dto);
        return R.ok();
    }

    /**
     * 删除供应商
     *
     * @param id 供应商id
     */
    @ApiOperation(value = "删除仓库管理", notes = "删除仓库管理")
    @DeleteMapping("/delete-conservator/{id}")
    public R<?> deleteConservator(@PathVariable("id") Long id) {
        userService.deleteConservator(id);
        return R.ok();
    }

    @InnerAuth
    @GetMapping("/list-by-name")
    R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {