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

nidapeng

2024-03-20 c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25

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

@@ -89,7 +89,12 @@

    @Override
    public List<SystemPermission> findList(SystemPermission systemPermission) {
        Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
        QueryWrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
        if(systemPermission.getTypeList()!=null){
            wrapper.lambda().and(w->{w.isNull(SystemPermission::getType).or()
                    .in(SystemPermission::getType,systemPermission.getTypeList());
            });
        }
        return systemPermissionMapper.selectList(wrapper);
    }