Commit 729328d2 authored by 周昊's avatar 周昊
Browse files

1、修改获取固有风险列表 

2、开发获取全部组织机构列表
parent 237a3282

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

+16 −1
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ import com.censoft.censoftrongtong.service.*; 
import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.domain.entity.SysDept;

import com.ruoyi.common.core.domain.entity.SysDictData;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.system.service.ISysDeptService;

import com.ruoyi.system.service.ISysDictDataService;

import com.ruoyi.system.service.ISysUploadFileService;

import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,9 @@ import java.util.stream.Collectors; 
@RequestMapping("/app-api/risk/plan")

public class RiskPlanAppController extends BaseController {



    @Resource

    private ISysDeptService sysDeptService;



    @Resource

    private ILedgerProjectService ledgerProjectService;
@@ -106,6 +111,16 @@ public class RiskPlanAppController extends BaseController { 
        return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId, type));

    }



    /**

     * 获取全部组织机构列表

     *

     * @real_return {@link R<List<SysDept>>}

     */

    @GetMapping("/dept/list")

    public R<List<SysDept>> getDeptList() {

        return R.ok(sysDeptService.selectDeptList(new SysDept()));

    }



    /**

     * 获取组织机构下的人员

     *
@@ -292,7 +307,7 @@ public class RiskPlanAppController extends BaseController { 
    @GetMapping("/inherent/list/{planId}/{buildingId}")

    public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId

            , @PathVariable("buildingId") Long buildingId, Long floorId, Long roomId) {

        return R.ok(riskPlanInherentListService.getInherentListByPlanId(planId, buildingId, floorId, roomId));

        return R.ok(riskPlanInherentListService.getInherentListByPlanId(null, buildingId, floorId, roomId));

    }



    /**