bug修改

xuhy

2 天以前 b7ec3aff011f05e236e76be844540dbe776f7353

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java

@@ -157,7 +157,7 @@
    @Log(title = "实验结果工作评定管理-删除化验师、实验员工作评定", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除化验师、实验员工作评定")
    @DeleteMapping(value = "/open/t-result-work-evaluate/deleteById")
    public R<Boolean> deleteById(@RequestBody String id) {
    public R<Boolean> deleteById(@RequestParam String id) {
        tResultWorkEvaluateService.removeById(id);
        return R.ok();
    }
@@ -285,11 +285,12 @@
        TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
        SysUser sysUser = sysUserService.selectUserById(loginUser.getUser().getUserId());
        if (sysUser.getRoleType() != 1) {
            List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
            List<String> teamIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
                    .stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            if (collect.isEmpty()) {
            if (teamIds.isEmpty()) {
                return R.ok(new PageInfo<>());
            }
            query.setTeamIds(teamIds);
        }
        return R.ok(tResultWorkEvaluateService.pageList(query));
    }