Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-05-20 e70eb0a8b1330eacd21ce17478f04fde3b8f7939

 server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java

@@ -153,6 +153,7 @@
            boolean depart=false;
            boolean departAndLeaf=false;
            boolean custom=false;
            boolean self=false;
            String c = "";
            for(SystemDataPermissionListVO d : list){
                if(!all && Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.all)){
@@ -171,6 +172,9 @@
                    custom =true;
                    c += StringUtils.defaultString(d.getCustomData(),"");
                }
                if(  Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.self)){
                    self =true;
                }
            }
            CompanyDepartment department = new CompanyDepartment();
            department.setId(user.getDepartmentId());
@@ -185,6 +189,8 @@

            if(all){
                return  null;
            }else if(self){
                return  new ArrayList<>();
            }else{
                List<Integer> dList = new ArrayList<>();
                dList.add(-1);//虚拟部门，排查空集合
@@ -277,4 +283,27 @@
        }
        return false;
    }


    @Override
    public SystemDataPermission findByRoleId(SystemDataPermission pageWrap){
        if ( pageWrap.getRoleId() == null) {
            return null;
        }

        // 查询数据权限
        QueryWrapper<SystemDataPermission> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda()
                .eq(SystemDataPermission::getBusinessCode, "DEPARTMENT")
                .eq(SystemDataPermission::getRoleId, pageWrap.getRoleId())
                .eq(SystemDataPermission::getDeleted, Boolean.FALSE)
                .eq(SystemDataPermission::getDisabled, Boolean.FALSE);
        List<SystemDataPermission> result = systemDataPermissionMapper.selectList(queryWrapper);
        if(result!=null && result.size()>0){
            return result.get(0);
        }
        return  null;
    }


}