fengjin
2022-12-06 6e93de03d7608dcd792266e80e2c52e240762886
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -46,12 +46,13 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("2")){
         list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
        else {
        if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
        }
        else {
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
        }
        int num=iElseAccessoryService.countNum(name,ids);
        return getDataTable(list,num);
@@ -68,7 +69,7 @@
    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);