Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-24 e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293

 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java

@@ -2,6 +2,7 @@

import com.yuanchu.limslaboratory.pojo.Organizational;
import com.yuanchu.limslaboratory.service.OrganizationalService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -34,10 +35,21 @@
    @ApiOperation(value = "侧边栏树展开")
    @GetMapping("/list")
    public Result<?> getFourLevelInformation() {
        Map<String, Object> organizationalTree = organizationalService.OrganizationalTree();
        List<Map<String, Object>> organizationalTree = organizationalService.OrganizationalTree();
        return Result.success(organizationalTree);
    }

    @ApiOperation(value = "根据点击Id查询部门")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(value = "部门ID", name = "departmentId", dataTypeClass = Integer.class)
    })
    @GetMapping("/table")
    public Result<?> getDepartmentListTable(Integer departmentId) {
        MyUtil.PrintLog(departmentId.toString());
        List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId);
        return Result.success(departmentListTable);
    }

    @ApiOperation(value = "添加部门")
    @PostMapping("/add")
    public Result<?> addDepartment(@RequestBody @Validated Organizational organizational) {