Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-22 7d1feae71bfd79b9021e516916b79f918bfcbcd9

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

@@ -59,16 +59,29 @@
    @Autowired
    private PositionService positionService;


    @Autowired
    private PlanService planService;

    @Autowired
    private ScreenAccountService screenAccountService;

    @ApiOperation(value = "获取项目列表",response = Project.class)
    @GetMapping("/getProjectList")
    public R<List<Project>> getProjectList(@RequestParam Integer clientId) {
        List<Project> list = projectService.list(new LambdaQueryWrapper<Project>().eq(Project::getDeleted, false).eq(Project::getClientId, clientId).orderByDesc(Project::getCreateTime));
        return R.ok(list);

    @ApiOperation(value = "获取项目/委托方列表",response = LoginNameVo.class)
    @GetMapping("/getLoginNameVoList")
    public R<List<LoginNameVo>> getProjectList(@RequestParam Integer userId) {
        ScreenAccount screenAccount = screenAccountService.getById(userId);
        String clientProjectIds = screenAccount.getClientProjectIds();
        if(screenAccount.getType()==1){
            // 委托方
            List<LoginNameVo> list = screenAccountService.getLoginClient(clientProjectIds);
            return R.ok(list);
        }else {
            // 项目
            List<LoginNameVo> list = screenAccountService.getLoginProject(clientProjectIds);
            return R.ok(list);

        }

    }


@@ -92,6 +105,8 @@
        if(task!=null){
            projectVo.setCheckTime(task.getUpdateTime());
        }
        List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
        projectVo.setDeviceCountVos(list);
        return R.ok(projectVo);
    }