Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java

@@ -2,13 +2,18 @@


import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.core.dto.PersonDto;
import com.ruoyi.framework.util.HeaderToken;
import com.ruoyi.system.service.UserService;
import com.ruoyi.web.controller.dto.UpdateUserDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;


/**
@@ -24,8 +29,11 @@
    @Resource
    private UserService userService;

    @Autowired
    private HeaderToken headerToken;

    /**
     * todo:  type : 1: 获取检测人员信息
     *type : 1: 获取检测人员信息
     type : 2: 获取当前部门(实验室人员)
     * @param user
     * @param type
@@ -54,7 +62,7 @@
    @GetMapping("/selectUserDepartmentLimsName")
    @ApiOperation(value = "获取当前登录用户部门")
    public Result<?> selectUserDepartmentLimsName(){
        return Result.success("成功", userService.selectUserDepartmentLimsName());
        return Result.success(userService.selectUserDepartmentLimsName());
    }

    @PostMapping("/upUserDepardLimsId")
@@ -70,6 +78,34 @@
    }


    @ApiOperation(value = "查看人事系统组织架构")
    @GetMapping(value = "/selectCompaniesList")
    public Result<List<Company>> selectCompaniesList() {
        return Result.success(headerToken.companyUrl());
    }

    @ApiOperation("获取人事系统组织下的人员")
    @GetMapping(value = "/selectSimpleList")
    public Result<?> selectSimpleList(String companyId) {
        return Result.success(headerToken.userUrl(companyId));
    }

    @ApiOperation("将人事系统勾选的内容转移到本系统")
    @PostMapping(value = "/addPersonUser")
    public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
        return Result.success(userService.addPersonUser(personDto));
    }

    /**
     * 获取实验室下的检验员列表
     * @return
     */
    @ApiOperation(value = "获取实验室下的检验员列表")
    @GetMapping("/getLaboratoryPersonList")
    public Result<?> getLaboratoryPersonList() {
        return Result.success(userService.getLaboratoryPersonList());
    }


}