3.5增加登录验证、修改密码、人员列表调整

mitao

2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -54,7 +54,7 @@
    @Authorization
    public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
    {
        return getOrganizations(sysUser.getDepartmentId());
        return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
    }

    /**
@@ -162,8 +162,34 @@
    }




    /**
     * 通过父级id查询对应机构下的全部部门id
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
    @GetMapping("/getdepartment/id")
    public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
    {
        if(StringUtils.isEmpty(departmentId))
        {
            return getDataTable("departmentId 不能为空");
        }

        List<String> ids=new ArrayList<>();
        List<String> getId=iOrganizationChartService.getIds(departmentId);
        ids.addAll(getId);
        return getDataTable(ids);
    }





    /**
     * 通过父级id查询对应机构下的全部部门
     * @param departmentId
     * @return
     */
@@ -172,7 +198,17 @@
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
        List<OrganizationChartEntity> lists=null;
        if(StringUtils.isEmpty(departmentId))
        {
            lists= iOrganizationChartService.selectParentList(null,"1");

        }
        else
        {
            lists= iOrganizationChartService.selectParentList(departmentId,null);
        }

        if(lists.size()<1)
        {
            lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -182,7 +218,12 @@
        {
            return null;
        }
        ids.add(iOrganizationChartService.selectConfigById(departmentId));

        if(!StringUtils.isEmpty(departmentId))
        {
            ids.add(iOrganizationChartService.selectConfigById(departmentId));
        }

        return getDataTable(ids);
    }

@@ -203,4 +244,37 @@
        }
        return ids;
    }


    /**
     * 查询机构列表
     */
    @ApiOperation(value = "查询可切换机构列表",response = OrganizationChartEntity.class)
    @GetMapping("switch/getList")
    @Authorization
    public TableDataInfo switchGetList(@CurrentUser SysUser sysUser)
    {
        List<String> ids=new ArrayList<>();
        if(!StringUtils.isEmpty(sysUser.getMoreDepartmentIds()))
        {
            if(sysUser.getMoreDepartmentIds().indexOf(",")==-1)
            {
                ids.add(sysUser.getDepartmentId());
            }
            else
            {
                String[] list=sysUser.getMoreDepartmentIds().split(",");
                for (String id:list)
                {
                    ids.add(id);
                }
            }
        }
        else
        {
            ids.add(sysUser.getDepartmentId());
        }

        return getDataTable(iOrganizationChartService.selectConfigList(ids));
    }
}