Merge remote-tracking branch 'origin/master'

heheng

2025-12-03 430477c7e0777531f22fc18dc8906ea75cdc21d9

 multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysUserController.java

@@ -18,6 +18,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@Api(tags = "用户前端控制器")
@RestController
@RequestMapping("/system/user")
@@ -40,6 +42,17 @@
    public CommonResult list(SysUser user){
        return CommonResult.success(sysUserService.selectUserList(user));
    }

  @ApiOperation(value = "特殊作业人员列表(分页)")
  @ApiImplicitParams({
          @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
          @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10")
  })
  @GetMapping("/spList")
  public CommonResult spList(SysUser user){
    return CommonResult.success(sysUserService.selectSpUserList(user));
  }


    @PreAuthorize("hasAnyAuthority('train:exam:system','train:exam:company','train:exam:depart','train:exam:workshop','train:exam:other')")
    @ApiOperation(value = "根据用户id获取用户信息")
@@ -96,6 +109,24 @@
        return CommonResult.success();
    }


  @RepeatSubmit
  @ApiOperation(value = "特殊作业人员证书")
  @PutMapping(value = "/specialCertificate")
  public CommonResult specialCertificate(@RequestBody SysUser user){
    sysUserService.updateSpecialCertificate(user);
    return CommonResult.success();
  }

  @RepeatSubmit
  @ApiOperation(value = "单位人员情况分析")
  @GetMapping(value = "/getUserData")
  public CommonResult getUserData(@RequestParam Long companyId){
    Map<String, Object> userData = sysUserService.getUserData(companyId);
    return CommonResult.success(userData);
  }


  @ApiOperation(value = "岗位任职管理(分页)")
  @ApiImplicitParams({
          @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),