1.修改Bug

fengjin

2022-11-23 7460f7ea699acbcafe09438ede2d11d4f4ca0d48

1.修改Bug

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

@@ -50,14 +50,18 @@
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "isDivisionHead",required = false) String isDivisionHead,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        List<SysUser> list ;
        if (isDivisionHead!=null&&!isDivisionHead.equals(""))
            list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
        else
            list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
        int num=IUserService.selectNum("2",keyword,ids,null);
        return getDataTable(list,num);
    }
@@ -128,6 +132,7 @@
            user.setDepartmentIds(config.getDepartmentIds());
            user.setDepartmentIdStr(config.getDepartmentIdStr());
            user.setMoreDepartmentIds(config.getMoreDepartmentIds());
            user.setDataPermission(config.getMoreDepartmentIds());
            user.setMattersIds(config.getMattersIds());
            user.setMasterNames(config.getMasterNames());
            user.setMattersNames(config.getMattersNames());
@@ -183,6 +188,7 @@
        //是否是部门领导（1是  2不是）
        if(StringUtils.equals("1",config.getIsDivisionHead()))
        {
            config.setDataPermission(config.getMoreDepartmentIds());
            config.setRoleIds("13");
        }
        else